Browse Source

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>
tags/n3.1
wm4 Anton Khirnov 9 years ago
parent
commit
0b6e5d6b32
2 changed files with 0 additions and 8 deletions
  1. +0
    -7
      avconv.c
  2. +0
    -1
      avconv.h

+ 0
- 7
avconv.c View File

@@ -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) { switch (ist->dec_ctx->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
ret = decode_audio (ist, &avpkt, &got_output); ret = decode_audio (ist, &avpkt, &got_output);


+ 0
- 1
avconv.h View File

@@ -240,7 +240,6 @@ typedef struct InputStream {
int64_t nb_samples; /* number of samples in the last decoded audio frame before looping */ int64_t nb_samples; /* number of samples in the last decoded audio frame before looping */
PtsCorrectionContext pts_ctx; PtsCorrectionContext pts_ctx;
double ts_scale; double ts_scale;
int showed_multi_packet_warning;
AVDictionary *decoder_opts; AVDictionary *decoder_opts;
AVRational framerate; /* framerate forced with -r */ AVRational framerate; /* framerate forced with -r */




Loading…
Cancel
Save