# HG changeset patch # User reimar # Date 1238671606 0 # Node ID c3f239ee623fdf1cc083b9f8fcd17a0955d3125d # Parent 063522a177cc66d86bcb0cf54bf997a0e5d083ba Support DVD subtitles in mov/mp4 as created by Nero. See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4 diff -r 063522a177cc -r c3f239ee623f mov.c --- 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;