mirror of https://git.ffmpeg.org/ffmpeg.git
Read bitstream parameters for E-AC-3 streams before returning an error.
Originally committed as revision 14528 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
602116df9b
commit
55aff0d901
|
@ -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)
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue