diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 19:45:29 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 19:46:06 +0400 |
commit | 33a7e288ab2e453d110e1bd1da944ad5cabf833b (patch) | |
tree | 7d1e714635ac7c405ac0a865db6b61b11cc1a010 /ffmpeg.c | |
parent | 1046cd60d4b19d6376dd18164959c3ea30477855 (diff) | |
parent | d1780e01b8b7d6977260e7136243bf5fccd878ce (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: don't warn on multiple frames per packet for codecs that expect it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2049,7 +2049,8 @@ static int output_packet(InputStream *ist, const AVPacket *pkt) ist->pts = ist->next_pts; ist->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; |