diff --git a/avconv.c b/avconv.c index 35ea1f501914899cdeffeeea7f896514e8875e59..d87864682030877e98d74940b9cf88b0178ad821 100644 --- a/avconv.c +++ b/avconv.c @@ -1337,13 +1337,6 @@ static void process_input_packet(InputStream *ist, const AVPacket *pkt, int no_e ist->last_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); diff --git a/avconv.h b/avconv.h index f0a948f145e936a5522b3c85a8674442e2630d48..645dc30e121e38dcf22fb0e8181dad995c01cf9e 100644 --- a/avconv.h +++ b/avconv.h @@ -240,7 +240,6 @@ typedef struct InputStream { int64_t nb_samples; /* number of samples in the last decoded audio frame before looping */ PtsCorrectionContext pts_ctx; double ts_scale; - int showed_multi_packet_warning; AVDictionary *decoder_opts; AVRational framerate; /* framerate forced with -r */