[FFmpeg-cvslog] avcodec/proresdsp: rename CLIP_AND_BIAS to BANANA

[Clément Bœsch]

On Tue, Jan 14, 2014 at 04:34:47PM +0100, Michael Niedermayer wrote:
> ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 14 16:25:38 2014 +0100| [b821def9f5ee9db7c72db6e5232f94ff25ee05fd] | committer: Michael Niedermayer
> 
> avcodec/proresdsp: rename CLIP_AND_BIAS to BANANA
> 
> See: IRC log
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> 

:)

For the record, the bias was removed from the macro,

  16:15:23 <@ubitux> michaelni: CLIP_AND_BIAS could be renamed to CLIP :p
  16:16:44 <+nevcairiel> it could also be renamed to BANANA
  16:17:05 <@ubitux> BANANA is nice as well indeed

> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b821def9f5ee9db7c72db6e5232f94ff25ee05fd
> ---
> 
>  libavcodec/proresdsp.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c
> index c3d1f5c..ef252dc 100644
> --- a/libavcodec/proresdsp.c
> +++ b/libavcodec/proresdsp.c
> @@ -31,7 +31,7 @@
>  #define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8))           ///< minimum value for clipping resulting pixels
>  #define CLIP_MAX (1 << PRORES_BITS_PER_SAMPLE) - CLIP_MIN - 1  ///< maximum value for clipping resulting pixels
>  
> -#define CLIP_AND_BIAS(x) (av_clip((x), CLIP_MIN, CLIP_MAX))
> +#define CLIP(x) (av_clip((x), CLIP_MIN, CLIP_MAX))
>  
>  #if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER
>  /**
> @@ -45,7 +45,7 @@ static void put_pixels(uint16_t *dst, int stride, const int16_t *in)
>          for (x = 0; x < 8; x++) {
>              src_offset = (y << 3) + x;
>  
> -            dst[dst_offset + x] = CLIP_AND_BIAS(in[src_offset]);
> +            dst[dst_offset + x] = CLIP(in[src_offset]);
>          }
>      }
>  }
> 

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20140114/36494391/attachment.asc>