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.
This commit is contained in:
7
ffmpeg.c
7
ffmpeg.c
@ -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);
|
||||
|
Reference in New Issue
Block a user