diff options
| author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-16 12:17:24 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-01-13 10:27:03 +0100 |
| commit | a895292f2734b4aacd2f2c2db6c07ff5a6d535c4 (patch) | |
| tree | 293213e3f9cf326db84f38151ecbb63969c7c055 /libavformat/mov.c | |
| parent | 44129e38047b6a27291e487c2084894958c6f399 (diff) | |
mov: Convert to the new bitstream reader
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 8b38fa43b8..37afe79df0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -39,13 +39,15 @@ #include "libavutil/pixdesc.h" #include "libavutil/spherical.h" #include "libavutil/stereo3d.h" + #include "libavcodec/ac3tab.h" +#include "libavcodec/bitstream.h" + #include "avformat.h" #include "internal.h" #include "avio_internal.h" #include "riff.h" #include "isom.h" -#include "libavcodec/get_bits.h" #include "id3v1.h" #include "mov_chan.h" #include "replaygain.h" @@ -2078,7 +2080,7 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom) AVStream *st; MOVStreamContext *sc; unsigned int i, entries, sample_size, field_size, num_bytes; - GetBitContext gb; + BitstreamContext bc; unsigned char* buf; int ret; @@ -2136,10 +2138,10 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom) return ret; } - init_get_bits(&gb, buf, 8*num_bytes); + bitstream_init(&bc, buf, 8 * num_bytes); for (i = 0; i < entries && !pb->eof_reached; i++) { - sc->sample_sizes[i] = get_bits_long(&gb, field_size); + sc->sample_sizes[i] = bitstream_read(&bc, field_size); sc->data_size += sc->sample_sizes[i]; } |