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

[Reinhard Tartler]

ffmpeg | branch: release/0.10 | Reinhard Tartler <siretart at tauware.de> | Sat Jul  6 09:46:07 2013 +0200| [b20004b2e6165a6d5ef6bc6ae98d3d33c6460808] | committer: Reinhard Tartler

lavc: move put_bits_left in put_bits.h

(cherry picked from commit afe03092dd693d025d43e1620283d8d285c92772)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

Conflicts:
	libavcodec/dv.c

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

 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 03a05b3..6f74e7b 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -372,11 +372,6 @@ typedef struct BlockInfo {
 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);
-}
-
 /* decode AC coefficients */
 static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, DCTELEM *block)
 {
diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h
index 6e81267..905461a 100644
--- a/libavcodec/put_bits.h
+++ b/libavcodec/put_bits.h
@@ -73,6 +73,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)