virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Anton Khirnov 2014-03-17 11:14:14 +01:00
parent 4754345027
commit d1780e01b8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
avconv.c
View File

@ -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;