diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-24 15:05:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 18:43:50 +0100 |
| commit | 79d5d79f3837d8915b13c131feb5c7a7f5fb4357 (patch) | |
| tree | 85507abd4f7535ff9e36826314bdbac04ec4108d | |
| parent | fa47f6412dbf93b4865adf8c66618906a3274330 (diff) | |
| download | ffmpeg-79d5d79f3837d8915b13c131feb5c7a7f5fb4357.tar.gz | |
avcodec: Replace show_bits_long() by show_bits() where possible
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/golomb.h | 2 | ||||
| -rw-r--r-- | libavcodec/ivi.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg4audio.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 5cdfa0945d..7fd46a91bd 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -313,7 +313,7 @@ static inline int get_interleaved_se_golomb(GetBitContext *gb) } else { int log; skip_bits(gb, 8); - buf |= 1 | show_bits_long(gb, 24); + buf |= 1 | show_bits(gb, 24); if ((buf & 0xAAAAAAAA) == 0) return INVALID_VLC; diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index 18192cbf23..93afabeb15 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -1193,7 +1193,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, left = get_bits_count(&ctx->gb) & 0x18; skip_bits_long(&ctx->gb, 64 - left); if (get_bits_left(&ctx->gb) > 18 && - show_bits_long(&ctx->gb, 21) == 0xBFFF8) { // syncheader + inter type + show_bits(&ctx->gb, 21) == 0xBFFF8) { // syncheader + inter type AVPacket pkt; pkt.data = avpkt->data + (get_bits_count(&ctx->gb) >> 3); pkt.size = get_bits_left(&ctx->gb) >> 3; diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index e4d6716f7f..2d9fe35f69 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -118,7 +118,7 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, if (c->object_type == AOT_ALS) { skip_bits(gb, 5); - if (show_bits_long(gb, 24) != MKBETAG('\0','A','L','S')) + if (show_bits(gb, 24) != MKBETAG('\0','A','L','S')) skip_bits_long(gb, 24); specific_config_bitindex = get_bits_count(gb); diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 055afabc7e..bf74bd7f09 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -711,7 +711,7 @@ static int mpeg4_decode_partition_a(Mpeg4DecContext *ctx) int i; do { - if (show_bits_long(&s->gb, 19) == DC_MARKER) + if (show_bits(&s->gb, 19) == DC_MARKER) return mb_num - 1; cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); @@ -1782,7 +1782,7 @@ static void next_start_code_studio(GetBitContext *gb) { align_get_bits(gb); - while (get_bits_left(gb) >= 24 && show_bits_long(gb, 24) != 0x1) { + while (get_bits_left(gb) >= 24 && show_bits(gb, 24) != 0x1) { get_bits(gb, 8); } } |