Commit 51741a82 authored by Alex Converse's avatar Alex Converse

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
parent 496dcbbc
...@@ -1598,7 +1598,6 @@ static int parse_adts_frame_header(AACContext * ac, GetBitContext * gb) { ...@@ -1598,7 +1598,6 @@ static int parse_adts_frame_header(AACContext * ac, GetBitContext * gb) {
ac->m4ac.sample_rate = hdr_info.sample_rate; ac->m4ac.sample_rate = hdr_info.sample_rate;
ac->m4ac.sampling_index = hdr_info.sampling_index; ac->m4ac.sampling_index = hdr_info.sampling_index;
ac->m4ac.object_type = hdr_info.object_type; ac->m4ac.object_type = hdr_info.object_type;
}
if (hdr_info.num_aac_frames == 1) { if (hdr_info.num_aac_frames == 1) {
if (!hdr_info.crc_absent) if (!hdr_info.crc_absent)
skip_bits(gb, 16); skip_bits(gb, 16);
...@@ -1606,6 +1605,7 @@ static int parse_adts_frame_header(AACContext * ac, GetBitContext * gb) { ...@@ -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); ff_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0);
return -1; return -1;
} }
}
return size; return size;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment