diff options
| author | Casimir666 <casimir666@users.sourceforge.net> | 2010-06-20 15:10:55 +0400 |
|---|---|---|
| committer | Casimir666 <casimir666@users.sourceforge.net> | 2010-06-20 15:10:55 +0400 |
| commit | 2c170449ff5293be46bcb9698d9fe3e706b901c7 (patch) | |
| tree | 7ffcc23a408796883daa34684be2d60915b454dd /src/filters/parser | |
| parent | fc6e70487d3d4639321f84a8353dc30213670db2 (diff) | |
Added : support for Matroska presentation graphics
Fixed : undetected H264 video streams in Mpeg splitter
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2063 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/parser')
| -rw-r--r-- | src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp | 7 | ||||
| -rw-r--r-- | src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp index 3977fde20..ce716df10 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp @@ -1144,8 +1144,13 @@ bool CBaseSplitterFileEx::Read(avchdr& h, int len, CMediaType* pmt) DWORD dwStartCode;
- while(GetPos() < endpos+4 && BitRead(32, true) == 0x00000001 && (!h.spslen || !h.ppslen))
+ while(GetPos() < endpos+4 /*&& BitRead(32, true) == 0x00000001*/ && (!h.spslen || !h.ppslen))
{
+ if (BitRead(32, true) != 0x00000001)
+ {
+ BitRead(8);
+ continue;
+ }
__int64 pos = GetPos();
BitRead(32);
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp index 06df92503..9121d9969 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp @@ -584,6 +584,7 @@ avcsuccess: CodecID == "S_TEXT/ASS" || CodecID == "S_ASS" ? MEDIASUBTYPE_ASS :
CodecID == "S_TEXT/SSF" || CodecID == "S_SSF" ? MEDIASUBTYPE_SSF :
CodecID == "S_TEXT/USF" || CodecID == "S_USF" ? MEDIASUBTYPE_USF :
+ CodecID == "S_HDMV/PGS" ? MEDIASUBTYPE_HDMVSUB :
CodecID == "S_VOBSUB" ? MEDIASUBTYPE_VOBSUB :
MEDIASUBTYPE_NULL;
|