]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
If we get an error from ff_aac_parse_header() we should not trust the header info...
authoralexc <alexc@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 6 Mar 2009 22:36:24 +0000 (22:36 +0000)
committeralexc <alexc@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 6 Mar 2009 22:36:24 +0000 (22:36 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17860 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/aac.c

index 694f406823897febf14084cb91507eebb909bb6c..e10905eccf1a810d919d02c8b45fb1086f135f5c 100644 (file)
@@ -1598,7 +1598,6 @@ 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 (hdr_info.num_aac_frames == 1) {
         if (!hdr_info.crc_absent)
             skip_bits(gb, 16);
@@ -1606,6 +1605,7 @@ static int parse_adts_frame_header(AACContext * ac, GetBitContext * gb) {
         ff_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0);
         return -1;
     }
+    }
     return size;
 }