# HG changeset patch # User alexc # Date 1236378984 0 # Node ID 4fe6dee5f1ddf1f138bf90c664b7e052f6361c8a # Parent 955835e2bc99b975dd5e5b5b92859c4cbb142428 If we get an error from ff_aac_parse_header() we should not trust the header info that it provides. diff -r 955835e2bc99 -r 4fe6dee5f1dd aac.c --- a/aac.c Fri Mar 06 19:47:01 2009 +0000 +++ b/aac.c Fri Mar 06 22:36:24 2009 +0000 @@ -1598,7 +1598,6 @@ 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 @@ ff_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0); return -1; } + } return size; }