Skip to content
Snippets Groups Projects
Commit 55aff0d9 authored by Justin Ruggles's avatar Justin Ruggles
Browse files

Read bitstream parameters for E-AC-3 streams before returning an error.

Originally committed as revision 14528 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 602116df
No related branches found
No related tags found
No related merge requests found
...@@ -283,9 +283,6 @@ static int parse_frame_header(AC3DecodeContext *s) ...@@ -283,9 +283,6 @@ static int parse_frame_header(AC3DecodeContext *s)
if(err) if(err)
return err; return err;
if(hdr.bitstream_id > 10)
return AC3_PARSE_ERROR_BSID;
/* get decoding parameters from header info */ /* get decoding parameters from header info */
s->bit_alloc_params.sr_code = hdr.sr_code; s->bit_alloc_params.sr_code = hdr.sr_code;
s->channel_mode = hdr.channel_mode; s->channel_mode = hdr.channel_mode;
...@@ -310,6 +307,9 @@ static int parse_frame_header(AC3DecodeContext *s) ...@@ -310,6 +307,9 @@ static int parse_frame_header(AC3DecodeContext *s)
s->channel_in_cpl[s->lfe_ch] = 0; s->channel_in_cpl[s->lfe_ch] = 0;
} }
if(hdr.bitstream_id > 10)
return AC3_PARSE_ERROR_BSID;
return ac3_parse_header(s); return ac3_parse_header(s);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment