mirror of https://git.ffmpeg.org/ffmpeg.git
flacdec: When there is not enough data to read the next header block,
reset the bitstream reader instead of skipping backwards. Originally committed as revision 17798 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
29b9f58b37
commit
e1374c06d6
|
@ -229,7 +229,6 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
|
|||
static int metadata_parse(FLACContext *s)
|
||||
{
|
||||
int i, metadata_last, metadata_type, metadata_size;
|
||||
int initial_pos= get_bits_count(&s->gb);
|
||||
|
||||
skip_bits_long(&s->gb, 32);
|
||||
|
||||
|
@ -239,7 +238,8 @@ static int metadata_parse(FLACContext *s)
|
|||
metadata_size = get_bits_long(&s->gb, 24);
|
||||
|
||||
if (get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits) {
|
||||
skip_bits_long(&s->gb, initial_pos - get_bits_count(&s->gb));
|
||||
/* need more data. reset the bitstream reader and return. */
|
||||
init_get_bits(&s->gb, s->gb.buffer, s->gb.size_in_bits);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue