diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-06-28 03:40:35 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-06-30 16:03:27 +0200 |
| commit | 9d1b173aae27aae016ff799e48cd5aa1bdaba0ad (patch) | |
| tree | 838a25b37470beb64ed8015138186713366e961a /libavcodec | |
| parent | c7934c6c0b0c6e33a83ed12f6e20dc977a945384 (diff) | |
| download | ffmpeg-9d1b173aae27aae016ff799e48cd5aa1bdaba0ad.tar.gz | |
lavc: move put_bits_left in put_bits.h
(cherry picked from commit afe03092dd693d025d43e1620283d8d285c92772)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dv.c | 5 | ||||
| -rw-r--r-- | libavcodec/put_bits.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 7067f0caf2..0cbb106571 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -339,11 +339,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 f32b7fd060..d13a744e47 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) |