diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-11-25 05:03:29 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-11-25 05:03:29 +0000 |
| commit | adc7305424187bf58516d73a368e569e9d7dcdb9 (patch) | |
| tree | 56240f32e903ab5e0493cc78b1704e7e6882f83a | |
| parent | 581ba2cee10defd479a3db93822013dfc949847d (diff) | |
| download | ffmpeg-streaming-adc7305424187bf58516d73a368e569e9d7dcdb9.zip ffmpeg-streaming-adc7305424187bf58516d73a368e569e9d7dcdb9.tar.gz | |
In mov demuxer, if multiple h264 stsd are present, do not concatenate streams, fix #2069
Originally committed as revision 25825 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 1fc86ea..eeeba40 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -939,10 +939,14 @@ int ff_mov_read_stsd_entries(MOVContext *c, ByteIOContext *pb, int entries) /* Multiple fourcc, we skip JPEG. This is not correct, we should * export it as a separate AVStream but this needs a few changes * in the MOV demuxer, patch welcome. */ + multiple_stsd: av_log(c->fc, AV_LOG_WARNING, "multiple fourcc not supported\n"); url_fskip(pb, size - (url_ftell(pb) - start_pos)); continue; } + /* we cannot demux concatenated h264 streams because of different extradata */ + if (st->codec->codec_tag && st->codec->codec_tag == AV_RL32("avc1")) + goto multiple_stsd; sc->pseudo_stream_id = st->codec->codec_tag ? -1 : pseudo_stream_id; sc->dref_id= dref_id; |
