virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec: Replace show_bits_long() by show_bits() where possible

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-11-24 15:05:24 +01:00
parent fa47f6412d
commit 79d5d79f38
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/golomb.h
View File

@@ -313,7 +313,7 @@ static inline int get_interleaved_se_golomb(GetBitContext *gb)
} else { } else {
int log; int log;
skip_bits(gb, 8); skip_bits(gb, 8);
buf |= 1 | show_bits_long(gb, 24); buf |= 1 | show_bits(gb, 24);
if ((buf & 0xAAAAAAAA) == 0) if ((buf & 0xAAAAAAAA) == 0)
return INVALID_VLC; return INVALID_VLC;

2
libavcodec/ivi.c
View File

@@ -1193,7 +1193,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
left = get_bits_count(&ctx->gb) & 0x18; left = get_bits_count(&ctx->gb) & 0x18;
skip_bits_long(&ctx->gb, 64 - left); skip_bits_long(&ctx->gb, 64 - left);
if (get_bits_left(&ctx->gb) > 18 && 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; AVPacket pkt;
pkt.data = avpkt->data + (get_bits_count(&ctx->gb) >> 3); pkt.data = avpkt->data + (get_bits_count(&ctx->gb) >> 3);
pkt.size = get_bits_left(&ctx->gb) >> 3; pkt.size = get_bits_left(&ctx->gb) >> 3;

2
libavcodec/mpeg4audio.c
View File

@@ -118,7 +118,7 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb,
if (c->object_type == AOT_ALS) { if (c->object_type == AOT_ALS) {
skip_bits(gb, 5); 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); skip_bits_long(gb, 24);
specific_config_bitindex = get_bits_count(gb); specific_config_bitindex = get_bits_count(gb);

4
libavcodec/mpeg4videodec.c
View File

@@ -711,7 +711,7 @@ static int mpeg4_decode_partition_a(Mpeg4DecContext *ctx)
int i; int i;
do { do {
if (show_bits_long(&s->gb, 19) == DC_MARKER) if (show_bits(&s->gb, 19) == DC_MARKER)
return mb_num - 1; return mb_num - 1;
cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); 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); 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); get_bits(gb, 8);
} }
} }