Mercurial > libavformat.hg

diff mov.c @ 4806:c3f239ee623f libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support DVD subtitles in mov/mp4 as created by Nero. See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4
author reimar
date Thu, 02 Apr 2009 11:26:46 +0000
parents 0493d65debd7
children 916678f56bfd
line wrap: on
line diff
--- a/mov.c	Thu Apr 02 03:52:19 2009 +0000
+++ b/mov.c	Thu Apr 02 11:26:46 2009 +0000
@@ -997,6 +997,7 @@
             // ttxt stsd contains display flags, justification, background
             // color, fonts, and default styles, so fake an atom to read it
             MOVAtom fake_atom = { .size = size - (url_ftell(pb) - start_pos) };
+            if (format != AV_RL32("mp4s")) // mp4s contains a regular esds atom
             mov_read_glbl(c, pb, fake_atom);
             st->codec->codec_id= id;
             st->codec->width = sc->width;