[SCM] libav/experimental: avconv: don't warn on multiple frames per packet for codecs that expect it

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d1780e01b8b7d6977260e7136243bf5fccd878ce
Author: Anton Khirnov <anton at khirnov.net>
Date:   Mon Mar 17 11:14:14 2014 +0100

    avconv: don't warn on multiple frames per packet for codecs that expect it

diff --git a/avconv.c b/avconv.c
index 68e3329..5d4daba 100644
--- 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;

-- 
Libav/FFmpeg packaging