aac: Set sample rate in avctx from ADTS header (if not already set by some

other means)



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20773 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/aac.c

@@ -1692,6 +1692,8 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
         ac->m4ac.sample_rate     = hdr_info.sample_rate;
         ac->m4ac.sampling_index  = hdr_info.sampling_index;
         ac->m4ac.object_type     = hdr_info.object_type;
+        if (!ac->avccontext->sample_rate)
+            ac->avccontext->sample_rate = hdr_info.sample_rate;
         if (hdr_info.num_aac_frames == 1) {
             if (!hdr_info.crc_absent)
                 skip_bits(gb, 16);