[FFmpeg-cvslog] lavc: move put_bits_left in put_bits.h

[Luca Barbato]

ffmpeg | branch: release/1.2 | Luca Barbato <lu_zero at gentoo.org> | Fri Jun 28 03:40:35 2013 +0200| [61a51598e3434f9f63025e6df3b065d7986540dc] | committer: Michael Niedermayer

lavc: move put_bits_left in put_bits.h
(cherry picked from commit afe03092dd693d025d43e1620283d8d285c92772)

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

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

 libavcodec/dv.c       |    5 -----
 libavcodec/put_bits.h |    8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 0812dbb..acf73f0 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -350,11 +350,6 @@ static av_cold int dvvideo_init_encoder(AVCodecContext *avctx)
 static const int vs_total_ac_bits = (100 * 4 + 68*2) * 5;
 static const int mb_area_start[5] = { 1, 6, 21, 43, 64 };
 
-static inline int put_bits_left(PutBitContext* s)
-{
-    return (s->buf_end - s->buf) * 8 - put_bits_count(s);
-}
-
 #if CONFIG_SMALL
 /* Converts run and level (where level != 0) pair into VLC, returning bit size */
 static av_always_inline int dv_rl2vlc(int run, int level, int sign, uint32_t* vlc)
diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h
index 7320443..e2c4a61 100644
--- a/libavcodec/put_bits.h
+++ b/libavcodec/put_bits.h
@@ -76,6 +76,14 @@ static inline int put_bits_count(PutBitContext *s)
 }
 
 /**
+ * @return the number of bits available in the bitstream.
+ */
+static inline int put_bits_left(PutBitContext* s)
+{
+    return (s->buf_end - s->buf_ptr) * 8 - 32 + s->bit_left;
+}
+
+/**
  * Pad the end of the output stream with zeros.
  */
 static inline void flush_put_bits(PutBitContext *s)