diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-04-02 11:26:46 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-04-02 11:26:46 +0000 |
| commit | fb9ac654113672948632609d878c2bf65781f0e2 (patch) | |
| tree | dd9db988ea316fb4bb6923ea18da368edb4a0f93 /libavformat | |
| parent | e103e6dbcfb25058bf704802a73295c769016f68 (diff) | |
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
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |