diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-18 03:02:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-18 03:02:36 +0100 |
| commit | a8dec360c5db15e8da4b44ff3c0f02a6c57e8ac0 (patch) | |
| tree | 3d7052c259f0b65f5ebbecb4a1d5d067d1df20ba | |
| parent | 6f5c36832dfc28d8ace0e54eb24a2964d32424c3 (diff) | |
| download | ffmpeg-a8dec360c5db15e8da4b44ff3c0f02a6c57e8ac0.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>
| -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 8c497d62da..9522909bfc 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2846,9 +2846,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 && |