From: Alex Converse Date: Fri, 6 Mar 2009 22:36:24 +0000 (+0000) Subject: If we get an error from ff_aac_parse_header() we should not trust the header info... X-Git-Tag: v0.6~5457 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51741a82c3265cc549baa0a342450f1dac8581a1;p=platform%2Fupstream%2Flibav.git If we get an error from ff_aac_parse_header() we should not trust the header info that it provides. Originally committed as revision 17860 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/aac.c b/libavcodec/aac.c index 694f40682..e10905ecc 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -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; }