avformat/utils: dont count attached pics toward the probesize
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Nov 2013 02:02:36 +0000 (03:02 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Mon, 18 Nov 2013 13:33:09 +0000 (14:33 +0100)
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)

libavformat/utils.c

index ea07d9b..a010f29 100644 (file)
@@ -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 &&