On Fri, Jun 28, 2013 at 06:53:30AM +0200, Luca Barbato wrote:
> ---
> 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 5253b7f..f85a65b 100644
> --- a/libavcodec/dv.c
> +++ b/libavcodec/dv.c
> @@ -340,11 +340,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 6ea0592..e3412cb 100644
> --- a/libavcodec/put_bits.h
> +++ b/libavcodec/put_bits.h
> @@ -75,6 +75,14 @@ static inline int put_bits_count(PutBitContext *s)
> }
>
> /**
> + * @return the number of bits available in the bitstream.
slightly bikesheddy but probably OK
> + */
> +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)
> --
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
