[FFmpeg-cvslog] r18314 - trunk/libavformat/mov.c

[reimar]

Author: reimar
Date: Thu Apr  2 13:26:46 2009
New Revision: 18314

Log:
Support DVD subtitles in mov/mp4 as created by Nero.
See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4

Modified:
   trunk/libavformat/mov.c

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	Thu Apr  2 10:53:34 2009	(r18313)
+++ trunk/libavformat/mov.c	Thu Apr  2 13:26:46 2009	(r18314)
@@ -997,6 +997,7 @@ static int mov_read_stsd(MOVContext *c, 
             // 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;