RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

get_bits: add get_bitsz for reading 0-25 bits 

This can be used to simplify code in a couple of places.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2016-01-03 00:28:42 +01:00
parent 97c162add7
commit 713654d9d3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/get_bits.h
View File

@ -269,6 +269,14 @@ static inline unsigned int get_bits(GetBitContext *s, int n)
return tmp; return tmp;
} }
/**
* Read 0-25 bits.
*/
static av_always_inline int get_bitsz(GetBitContext *s, int n)
{
return n ? get_bits(s, n) : 0;
}
static inline unsigned int get_bits_le(GetBitContext *s, int n) static inline unsigned int get_bits_le(GetBitContext *s, int n)
{ {
register int tmp; register int tmp;

7
libavcodec/mpegaudiodec_template.c
View File

@ -816,13 +816,6 @@ static void exponents_from_scale_factors(MPADecodeContext *s, GranuleDef *g,
} }
} }
/* handle n = 0 too */
static inline int get_bitsz(GetBitContext *s, int n)
{
return n ? get_bits(s, n) : 0;
}
static void switch_buffer(MPADecodeContext *s, int *pos, int *end_pos, static void switch_buffer(MPADecodeContext *s, int *pos, int *end_pos,
int *end_pos2) int *end_pos2)
{ {