diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-02 17:32:53 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-02 17:32:53 +0000 |
| commit | ee4d0322e8cd1c0aa0bef1b2154ac246cb511502 (patch) | |
| tree | 42283c8279839734d5ec63f43e4d8fa088fdabb9 | |
| parent | b89e77cff724f1ea1cb6e23a57aa7fd80ad59f44 (diff) | |
| download | ffmpeg-ee4d0322e8cd1c0aa0bef1b2154ac246cb511502.tar.gz | |
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
| -rw-r--r-- | libavcodec/flacdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index b3592f4183..5350d025c2 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -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); |