[FFmpeg-cvslog] avformat/utils: dont count attached pics toward the probesize
Michael Niedermayer
git at videolan.org
Mon Nov 18 15:19:45 CET 2013
ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 18 03:02:36 2013 +0100| [842def7d78137dafff39988326031cd943bc2a19] | committer: Carl Eugen Hoyos
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 at gmx.at>
(cherry picked from commit a8dec360c5db15e8da4b44ff3c0f02a6c57e8ac0)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=842def7d78137dafff39988326031cd943bc2a19
---
libavformat/utils.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 04984a1..bcea353 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2864,9 +2864,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 &&
More information about the ffmpeg-cvslog
mailing list