[FFmpeg-cvslog] get_bits: return pointer to buffer that is the result of the alignment.

Ronald S. Bultje git at videolan.org
Mon Feb 11 02:36:46 CET 2013


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sun Feb 10 16:46:07 2013 -0800| [fd6a021d8e3d63249510ebbecc3fe11ae7771ae8] | committer: Michael Niedermayer

get_bits: return pointer to buffer that is the result of the alignment.

This allows more transparent mixing of get_bits and whole-byte access
without having to touch get_bits internals.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd6a021d8e3d63249510ebbecc3fe11ae7771ae8
---

 libavcodec/get_bits.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index 7129b17..f16a508 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -415,11 +415,12 @@ static inline int init_get_bits8(GetBitContext *s, const uint8_t *buffer,
     return init_get_bits(s, buffer, byte_size * 8);
 }
 
-static inline void align_get_bits(GetBitContext *s)
+static inline const uint8_t *align_get_bits(GetBitContext *s)
 {
     int n = -get_bits_count(s) & 7;
     if (n)
         skip_bits(s, n);
+    return s->buffer + (s->index >> 3);
 }
 
 #define init_vlc(vlc, nb_bits, nb_codes,                \



More information about the ffmpeg-cvslog mailing list