[FFmpeg-cvslog] avformat: do not require frame_size in avformat_find_stream_info() for AAC

Justin Ruggles git at videolan.org
Tue Mar 6 06:15:58 CET 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Mon Feb 27 00:50:16 2012 -0500| [84b6ae0808e4c63cfde4a5f47e33667d57838d8e] | committer: Justin Ruggles

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84b6ae0808e4c63cfde4a5f47e33667d57838d8e
---

 libavformat/utils.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d882991..dbc8a53 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 ||



More information about the ffmpeg-cvslog mailing list