diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index cb2be4fadf6b0057d9313d2d19ad322f1c88d87f..29e72059d3b1e5b4390dd21b114d224d1b3531b0 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -249,6 +249,14 @@ static inline unsigned int get_bits(GetBitContext *s, int n) return tmp; } +/** + * Read 0-25 bits. + */ +static av_always_inline int get_bitsz(GetBitContext *s, int n) +{ + return n ? get_bits(s, n) : 0; +} + /** * Show 1-25 bits. */ diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 184d67bf3bd8e07eaaabf69a0e29de8e3ecc473f..820a7ae938820e6392febff7820bd3c39e6e7f21 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -795,13 +795,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, int *end_pos2) {