diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-18 03:02:36 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-11-18 14:33:09 +0100 |
| commit | 9a22d6dd6326f80dd8af93c964a57428ef08deeb (patch) | |
| tree | 215b9b3d6074aa5914defbdac71c9679c3054010 | |
| parent | beb28bc55dc73ae18e6a51e6f8f06ea0399da3e7 (diff) | |
| download | ffmpeg-9a22d6dd6326f80dd8af93c964a57428ef08deeb.tar.gz | |
avformat/utils: dont count attached pics toward the probesize
Such pics behave more like headers which we also dont count.
Fixes Ticket3146
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a8dec360c5db15e8da4b44ff3c0f02a6c57e8ac0)
| -rw-r--r-- | libavformat/utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index ea07d9bff8..a010f29cb9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2793,9 +2793,10 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) goto find_stream_info_err; } - read_size += pkt->size; - st = ic->streams[pkt->stream_index]; + if (!(st->disposition & AV_DISPOSITION_ATTACHED_PIC)) + read_size += pkt->size; + if (pkt->dts != AV_NOPTS_VALUE && st->codec_info_nb_frames > 1) { /* check for non-increasing dts */ if (st->info->fps_last_dts != AV_NOPTS_VALUE && |