[SCM] libav/experimental: make av_find_stream_info find frame_size for aac too

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f3b5a1a260e2a2061fbbadf64d3a41225af0dbaf
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Wed Jun 25 19:30:48 2008 +0000

    make av_find_stream_info find frame_size for aac too
    
    Originally committed as revision 13976 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index f098d05..d2ed35d 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:

-- 
Libav/FFmpeg packaging