From 62825236dba31a2240e25974a3ba41c1303e4edc Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Date: Mon, 11 Jan 2016 21:05:55 +0100
Subject: [PATCH] lavc: Add get_bitsz()
get_bit variant supporting 0-bits reads.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---
libavcodec/get_bits.h | 8 ++++++++
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 cb2be4fadf6..29e72059d3b 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 184d67bf3bd..820a7ae9388 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)
{
--
GitLab