avconv: remove sub-frame warning

It's not practical to keep this with the new decode API.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

diff --git a/avconv.c b/avconv.c
index 35ea1f5..d878646 100644 (file)
--- 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;
 
 
         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);
         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 f0a948f..645dc30 100644 (file)
--- 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;
     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 */
 
     AVDictionary *decoder_opts;
     AVRational framerate;               /* framerate forced with -r */