diff options
author | wm4 <nfxjfg@googlemail.com> | 2016-10-01 17:22:02 +0200 |
---|---|---|
committer | wm4 <nfxjfg@googlemail.com> | 2016-10-01 17:22:02 +0200 |
commit | b2fea2fdee464edd736fc903ec3a4dc1e3a06e56 (patch) | |
tree | 54b7197f5fd4a8781c4568704bba135884291bb4 /ffmpeg.c | |
parent | 3c18188f9f3e5d7980c7998416a39f7efba307bf (diff) | |
download | ffmpeg-streaming-b2fea2fdee464edd736fc903ec3a4dc1e3a06e56.zip ffmpeg-streaming-b2fea2fdee464edd736fc903ec3a4dc1e3a06e56.tar.gz |
ffmpeg: move subframe warning to libavcodec
With the new decode API, doing this in ffmpeg.c is impractical. There
was resistance against removing the warning, so put it into libavcodec.
Not bothering with reducing the warning to verbose log level for
subsequent wanrings. The warning should be rare, and only happen when
developing new codecs for the old API.
Includes a change suggested by Michael Niedermayer.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 7 |
1 files changed, 0 insertions, 7 deletions
@@ -2357,13 +2357,6 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo ist->pts = ist->next_pts; ist->dts = ist->next_dts; - if (avpkt.size && avpkt.size != pkt->size && - !(ist->dec->capabilities & AV_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; - } - switch (ist->dec_ctx->codec_type) { case AVMEDIA_TYPE_AUDIO: ret = decode_audio (ist, &avpkt, &got_output); |