diff options
| author | Aleksoid <aleksoid@users.sourceforge.net> | 2011-03-30 04:59:42 +0400 |
|---|---|---|
| committer | Aleksoid <aleksoid@users.sourceforge.net> | 2011-03-30 04:59:42 +0400 |
| commit | e10d9bf9172aded2223b2ec5700a92e54f5642e6 (patch) | |
| tree | bcb047afd339fc75e1122d3a7a27e79c43d73f24 /src/filters/parser/MP4Splitter | |
| parent | 589d41f83fc8d8d3a02a1554dc244eed5f0acc39 (diff) | |
Fix : seek hanging on .divx(avi) with video taged subtitles;
Add : support sbtl(subtitle) in m4v file;
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2999 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/parser/MP4Splitter')
| -rw-r--r-- | src/filters/parser/MP4Splitter/AP4/Core/Ap4HdlrAtom.h | 1 | ||||
| -rw-r--r-- | src/filters/parser/MP4Splitter/AP4/Core/Ap4Track.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/filters/parser/MP4Splitter/AP4/Core/Ap4HdlrAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HdlrAtom.h index 63b9d1507..172a78df6 100644 --- a/src/filters/parser/MP4Splitter/AP4/Core/Ap4HdlrAtom.h +++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HdlrAtom.h @@ -46,6 +46,7 @@ const AP4_UI32 AP4_HANDLER_TYPE_TEXT = AP4_ATOM_TYPE('t','e','x','t'); const AP4_UI32 AP4_HANDLER_TYPE_TX3G = AP4_ATOM_TYPE('t','x','3','g');
const AP4_UI32 AP4_HANDLER_TYPE_SUBP = AP4_ATOM_TYPE('s','u','b','p');
const AP4_UI32 AP4_HANDLER_TYPE_HINT = AP4_ATOM_TYPE('h','i','n','t');
+const AP4_UI32 AP4_HANDLER_TYPE_SBTL = AP4_ATOM_TYPE('s','b','t','l');
/*----------------------------------------------------------------------
| AP4_HdlrAtom
diff --git a/src/filters/parser/MP4Splitter/AP4/Core/Ap4Track.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Track.cpp index 32e58baef..4d699c9f1 100644 --- a/src/filters/parser/MP4Splitter/AP4/Core/Ap4Track.cpp +++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Track.cpp @@ -137,9 +137,9 @@ AP4_Track::AP4_Track(AP4_TrakAtom& atom, m_Type = TYPE_AUDIO;
} else if (type == AP4_HANDLER_TYPE_VIDE) {
m_Type = TYPE_VIDEO;
- } else if (type == AP4_HANDLER_TYPE_TEXT) {
- m_Type = TYPE_TEXT;
- } else if (type == AP4_HANDLER_TYPE_TX3G) {
+ } else if (type == AP4_HANDLER_TYPE_TEXT ||
+ type == AP4_HANDLER_TYPE_SBTL ||
+ type == AP4_HANDLER_TYPE_TX3G) {
m_Type = TYPE_TEXT;
} else if (type == AP4_HANDLER_TYPE_SUBP) {
m_Type = TYPE_SUBP;
|