[FFmpeg-cvslog] r17860 - trunk/libavcodec/aac.c

[alexc]

Author: alexc
Date: Fri Mar  6 23:36:24 2009
New Revision: 17860

Log:
If we get an error from ff_aac_parse_header() we should not trust the header info that it provides.

Modified:
   trunk/libavcodec/aac.c

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	Fri Mar  6 22:19:16 2009	(r17859)
+++ trunk/libavcodec/aac.c	Fri Mar  6 23:36:24 2009	(r17860)
@@ -1598,7 +1598,6 @@ static int parse_adts_frame_header(AACCo
         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(AACCo
         ff_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0);
         return -1;
     }
+    }
     return size;
 }