diff options
author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-15 11:55:58 +0200 |
---|---|---|
committer | Alexandra Hájková <alexandra@khirnov.net> | 2016-05-22 16:48:00 +0200 |
commit | 9aeea7f850050464d88b9d2063b78c4bd23c1064 (patch) | |
tree | 134198e76e5994674ab648511cf65ca8aaa00f3e | |
parent | a28c7673f761beee6861b6b44dd2ae83e4fb390a (diff) |
h261dec (demuxer): convert to the new bitstream reader
-rw-r--r-- | libavformat/h261dec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/h261dec.c b/libavformat/h261dec.c index 4a5805020f..8bbafd0cc0 100644 --- a/libavformat/h261dec.c +++ b/libavformat/h261dec.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/get_bits.h" +#include "libavcodec/bitstream.h" #include "avformat.h" #include "rawdec.h" @@ -31,16 +31,16 @@ static int h261_probe(AVProbeData *p) int invalid_psc=0; int next_gn=0; int src_fmt=0; - GetBitContext gb; + BitstreamContext bc; - init_get_bits(&gb, p->buf, p->buf_size*8); + bitstream_init(&bc, p->buf, p->buf_size * 8); for(i=0; i<p->buf_size*8; i++){ if ((code & 0x01ff0000) || !(code & 0xff00)) { - code = (code<<8) + get_bits(&gb, 8); + code = (code << 8) + bitstream_read(&bc, 8); i += 7; } else - code = (code<<1) + get_bits1(&gb); + code = (code << 1) + bitstream_read_bit(&bc); if ((code & 0xffff0000) == 0x10000) { int gn= (code>>12)&0xf; if(!gn) |