avconv: don't warn on multiple frames per packet for codecs that expect it
authorAnton Khirnov <anton@khirnov.net>
Mon, 17 Mar 2014 10:14:14 +0000 (11:14 +0100)
committerAnton Khirnov <anton@khirnov.net>
Mon, 24 Mar 2014 05:21:13 +0000 (06:21 +0100)
avconv.c

index 68e3329..5d4daba 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -1380,7 +1380,8 @@ static int output_packet(InputStream *ist, const AVPacket *pkt)
 
         ist->last_dts = ist->next_dts;
 
-        if (avpkt.size && avpkt.size != pkt->size) {
+        if (avpkt.size && avpkt.size != pkt->size &&
+            !(ist->dec->capabilities & CODEC_CAP_SUBFRAMES)) {
             av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
                    "Multiple frames in a packet from stream %d\n", pkt->stream_index);
             ist->showed_multi_packet_warning = 1;