summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAlexandra Hájková <alexandra@khirnov.net>2016-04-10 11:44:20 +0200
committerDiego Biurrun <diego@biurrun.de>2017-01-31 17:54:11 +0100
commit2d72219554adb09bc3ba044ac3e579a84550067b (patch)
tree2f2980810a7cb85f1bca11e6f586690e7adcce9f /libavformat
parent2b94ed12de7b6b7f444ed67e1a7068141af3d4ff (diff)
h261dec: Convert to the new bitstream reader
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/h261dec.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/h261dec.c b/libavformat/h261dec.c
index 4a5805020f..d8a2cecc77 100644
--- a/libavformat/h261dec.c
+++ b/libavformat/h261dec.c
@@ -19,7 +19,8 @@
* 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 +32,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)