From fb9ac654113672948632609d878c2bf65781f0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Thu, 2 Apr 2009 11:26:46 +0000 Subject: Support DVD subtitles in mov/mp4 as created by Nero. See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4 Originally committed as revision 18314 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libavformat') diff --git a/libavformat/mov.c b/libavformat/mov.c index 5dd7928a60..9a8f1355db 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -997,6 +997,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) // 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; -- cgit v1.2.3