diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-12-14 17:30:18 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-12-14 17:30:18 +0000 |
| commit | eedfe2227a74da5c5180b6d4ab75a61b79bc74f9 (patch) | |
| tree | 629358c80e17107542a104290ef490b86ae1a77a | |
| parent | 1238fa9fb875eeb3381828efb9ce28f588e811d3 (diff) | |
| download | ffmpeg-eedfe2227a74da5c5180b6d4ab75a61b79bc74f9.tar.gz | |
oggflac: fix bitstream reader usage
Originally committed as revision 16129 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/oggparseflac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index b1332c618b..802453adf8 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -38,21 +38,21 @@ flac_header (AVFormatContext * s, int idx) return 0; init_get_bits(&gb, os->buf + os->pstart, os->psize*8); - get_bits(&gb, 1); /* metadata_last */ + skip_bits1(&gb); /* metadata_last */ mdt = get_bits(&gb, 7); if (mdt == 0x7f) { - skip_bits(&gb, 4*8); /* "FLAC" */ + skip_bits_long(&gb, 4*8); /* "FLAC" */ if(get_bits(&gb, 8) != 1) /* unsupported major version */ return -1; - skip_bits(&gb, 8 + 16); /* minor version + header count */ - skip_bits(&gb, 4*8); /* "fLaC" */ + skip_bits_long(&gb, 8 + 16); /* minor version + header count */ + skip_bits_long(&gb, 4*8); /* "fLaC" */ /* METADATA_BLOCK_HEADER */ if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE) return -1; - skip_bits(&gb, 16*2+24*2); + skip_bits_long(&gb, 16*2+24*2); st->codec->sample_rate = get_bits_long(&gb, 20); st->codec->channels = get_bits(&gb, 3) + 1; |