diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-12-31 22:41:11 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-12-31 22:41:11 +0400 |
| commit | b1b3c479a061895794f1da923b8af95f67f50ce5 (patch) | |
| tree | e0c841cc9b6d2354704df65ef22d7948604a4076 /demuxer | |
| parent | 26711c2d863a20b549b289915d5895b20e13acfa (diff) | |
Add support for H.264 in PMP (Annex B format)
Diffstat (limited to 'demuxer')
| -rw-r--r-- | demuxer/LAVSplitter/StreamParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demuxer/LAVSplitter/StreamParser.cpp b/demuxer/LAVSplitter/StreamParser.cpp index 649399b4..8b162e21 100644 --- a/demuxer/LAVSplitter/StreamParser.cpp +++ b/demuxer/LAVSplitter/StreamParser.cpp @@ -59,7 +59,7 @@ HRESULT CStreamParser::Parse(const GUID &gSubtype, Packet *pPacket) if (!pPacket || (pPacket->dwFlags & LAV_PACKET_PARSED)) { Queue(pPacket); - } else if (m_gSubtype == MEDIASUBTYPE_AVC1 && (m_strContainer == "mpegts" || m_strContainer == "mpeg" || m_strContainer == "wtv" || m_strContainer == "asf" + } else if (m_gSubtype == MEDIASUBTYPE_AVC1 && (m_strContainer == "mpegts" || m_strContainer == "mpeg" || m_strContainer == "wtv" || m_strContainer == "asf" || m_strContainer == "pmp" || ((m_strContainer == "ogg" || m_strContainer == "matroska") && (pPacket->dwFlags & LAV_PACKET_H264_ANNEXB)))) { ParseH264AnnexB(pPacket); } else if (m_gSubtype == MEDIASUBTYPE_HDMVSUB) { |