diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-02-27 00:50:16 -0500 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-03-05 13:08:16 -0500 |
commit | 84b6ae0808e4c63cfde4a5f47e33667d57838d8e (patch) | |
tree | e5a910c507cd3dbe83d75efe60ed8b1fcef9d320 /libavformat/utils.c | |
parent | 620b88a302d522f71a6a95aff500cf7bd8520043 (diff) | |
download | ffmpeg-84b6ae0808e4c63cfde4a5f47e33667d57838d8e.tar.gz |
avformat: do not require frame_size in avformat_find_stream_info() for AAC
We already will get the needed info because of CODEC_CAP_CHANNEL_CONF
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d88299176d..dbc8a533f5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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 || |