avformat: do not require frame_size in avformat_find_stream_info() for AAC
authorJustin Ruggles <justin.ruggles@gmail.com>
Mon, 27 Feb 2012 05:50:16 +0000 (00:50 -0500)
committerJustin Ruggles <justin.ruggles@gmail.com>
Mon, 5 Mar 2012 18:08:16 +0000 (13:08 -0500)
We already will get the needed info because of CODEC_CAP_CHANNEL_CONF

libavformat/utils.c

index d882991..dbc8a53 100644 (file)
@@ -2019,7 +2019,6 @@ static int has_codec_parameters(AVCodecContext *avctx)
     case AVMEDIA_TYPE_AUDIO:
         val = avctx->sample_rate && avctx->channels && avctx->sample_fmt != AV_SAMPLE_FMT_NONE;
         if (!avctx->frame_size &&
-            (avctx->codec_id == CODEC_ID_AAC ||
              avctx->codec_id == CODEC_ID_MP1 ||
              avctx->codec_id == CODEC_ID_MP2 ||
              avctx->codec_id == CODEC_ID_MP3 ||