From d1780e01b8b7d6977260e7136243bf5fccd878ce Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 17 Mar 2014 11:14:14 +0100
Subject: [PATCH] avconv: don't warn on multiple frames per packet for codecs
that expect it
---
avconv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/avconv.c b/avconv.c
index 68e332997cb..5d4daba5cd6 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;
--
GitLab