Commit d1780e01 authored by Anton Khirnov's avatar Anton Khirnov

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

parent 47543450
...@@ -1380,7 +1380,8 @@ static int output_packet(InputStream *ist, const AVPacket *pkt) ...@@ -1380,7 +1380,8 @@ static int output_packet(InputStream *ist, const AVPacket *pkt)
ist->last_dts = ist->next_dts; 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, 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); "Multiple frames in a packet from stream %d\n", pkt->stream_index);
ist->showed_multi_packet_warning = 1; ist->showed_multi_packet_warning = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment