diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-25 19:30:48 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-25 19:30:48 +0000 |
| commit | f3b5a1a260e2a2061fbbadf64d3a41225af0dbaf (patch) | |
| tree | 8ae8363bfdd980447d3e5a296d7b9fe449e04cee | |
| parent | 80b616fca375fd7b9f3d65aa4dab8ddba589fe9f (diff) | |
| download | ffmpeg-f3b5a1a260e2a2061fbbadf64d3a41225af0dbaf.tar.gz | |
make av_find_stream_info find frame_size for aac too
Originally committed as revision 13976 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index f098d051b4..d2ed35d938 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1729,7 +1729,9 @@ static int has_codec_parameters(AVCodecContext *enc) switch(enc->codec_type) { case CODEC_TYPE_AUDIO: val = enc->sample_rate && enc->channels; - if(enc->codec_id == CODEC_ID_VORBIS && !enc->frame_size) + if(!enc->frame_size && + (enc->codec_id == CODEC_ID_VORBIS || + enc->codec_id == CODEC_ID_AAC)) return 0; break; case CODEC_TYPE_VIDEO: |