From 796a1eb3a849ba86df7f7e705ea3a9147381c569 Mon Sep 17 00:00:00 2001 From: Alexandra Hájková Date: Sat, 16 Apr 2016 17:51:16 +0200 Subject: oggparseflac: convert to the new bitstream reader --- libavformat/oggparseflac.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index dab1040cc4..ed7ada0f26 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -19,7 +19,7 @@ */ #include -#include "libavcodec/get_bits.h" +#include "libavcodec/bitstream.h" #include "libavcodec/flac.h" #include "avformat.h" #include "internal.h" @@ -33,28 +33,28 @@ flac_header (AVFormatContext * s, int idx) struct ogg *ogg = s->priv_data; struct ogg_stream *os = ogg->streams + idx; AVStream *st = s->streams[idx]; - GetBitContext gb; + BitstreamContext bc; int mdt; if (os->buf[os->pstart] == 0xff) return 0; - init_get_bits(&gb, os->buf + os->pstart, os->psize*8); - skip_bits1(&gb); /* metadata_last */ - mdt = get_bits(&gb, 7); + bitstream_init(&bc, os->buf + os->pstart, os->psize*8); + bitstream_skip(&bc, 1); /* metadata_last */ + mdt = bitstream_read(&bc, 7); if (mdt == OGG_FLAC_METADATA_TYPE_STREAMINFO) { uint8_t *streaminfo_start = os->buf + os->pstart + 5 + 4 + 4 + 4; uint32_t samplerate; - skip_bits_long(&gb, 4*8); /* "FLAC" */ - if(get_bits(&gb, 8) != 1) /* unsupported major version */ + bitstream_skip(&bc, 4*8); /* "FLAC" */ + if(bitstream_read(&bc, 8) != 1) /* unsupported major version */ return -1; - skip_bits_long(&gb, 8 + 16); /* minor version + header count */ - skip_bits_long(&gb, 4*8); /* "fLaC" */ + bitstream_skip(&bc, 8 + 16); /* minor version + header count */ + bitstream_skip(&bc, 4*8); /* "fLaC" */ /* METADATA_BLOCK_HEADER */ - if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE) + if (bitstream_read(&bc, 32) != FLAC_STREAMINFO_SIZE) return -1; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; -- cgit v1.2.3