mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
flacdec: Use get/skip_bits_long() for more than 17-bits and
get/skip_bits() for 17-bits or less. Originally committed as revision 17735 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
b89e77cff7
commit
ee4d0322e8
@ -206,10 +206,10 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
|
||||
avctx->sample_fmt = SAMPLE_FMT_S16;
|
||||
|
||||
s->samples = get_bits_long(&gb, 32) << 4;
|
||||
s->samples |= get_bits_long(&gb, 4);
|
||||
s->samples |= get_bits(&gb, 4);
|
||||
|
||||
skip_bits(&gb, 64); /* md5 sum */
|
||||
skip_bits(&gb, 64); /* md5 sum */
|
||||
skip_bits_long(&gb, 64); /* md5 sum */
|
||||
skip_bits_long(&gb, 64); /* md5 sum */
|
||||
|
||||
dump_headers(avctx, s);
|
||||
}
|
||||
@ -227,7 +227,7 @@ static int metadata_parse(FLACContext *s)
|
||||
int initial_pos= get_bits_count(&s->gb);
|
||||
|
||||
if (show_bits_long(&s->gb, 32) == MKBETAG('f','L','a','C')) {
|
||||
skip_bits(&s->gb, 32);
|
||||
skip_bits_long(&s->gb, 32);
|
||||
|
||||
do {
|
||||
metadata_last = get_bits1(&s->gb);
|
||||
|
Loading…
Reference in New Issue
Block a user