diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-11 21:05:55 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2016-01-11 21:51:11 +0100 |
| commit | 62825236dba31a2240e25974a3ba41c1303e4edc (patch) | |
| tree | abce32b7450336f92b13ec8bdfb8ff9189a89e1a | |
| parent | 81737f42c28858dad76a40284a35f7a64faa2fc7 (diff) | |
| download | ffmpeg-62825236dba31a2240e25974a3ba41c1303e4edc.tar.gz | |
lavc: Add get_bitsz()
get_bit variant supporting 0-bits reads.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/get_bits.h | 8 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec_template.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index cb2be4fadf..29e72059d3 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -250,6 +250,14 @@ static inline unsigned int get_bits(GetBitContext *s, int n) } /** + * 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. */ static inline unsigned int show_bits(GetBitContext *s, int n) diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 184d67bf3b..820a7ae938 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) { |