[FFmpeg-cvslog] r13660 - in trunk/libavcodec: avcodec.h libx264.c utils.c

[Aurelien Jacobs]

On Thu,  5 Jun 2008 03:57:36 +0200 (CEST)
bcoudurier <subversion at mplayerhq.hu> wrote:

> Author: bcoudurier
> Date: Thu Jun  5 03:57:35 2008
> New Revision: 13660
> 
> Log:
> add esa/dia compat me options and new tesa for libx264
> 
> [...]
> 
> Modified: trunk/libavcodec/libx264.c
> ==============================================================================
> --- trunk/libavcodec/libx264.c	(original)
> +++ trunk/libavcodec/libx264.c	Thu Jun  5 03:57:35 2008
> @@ -220,6 +220,8 @@ X264_init(AVCodecContext *avctx)
>          x4->params.analyse.i_me_method = X264_ME_UMH;
>      else if(avctx->me_method == ME_FULL)
>          x4->params.analyse.i_me_method = X264_ME_ESA;
> +    else if(avctx->me_method == ME_TESA)
> +        x4->params.analyse.i_me_method = X264_ME_TESA;
>      else x4->params.analyse.i_me_method = X264_ME_HEX;
>  
>      x4->params.analyse.i_me_range = avctx->me_range;

This don't compile with older x264 versions (ie. the one shipped
with various current distro).
I don't remember what's the politics about supporting older x264
or not. But adding a stricter check in configure to ensure recent
x264 is present shouldn't be hard. And a simple #ifdef around the
above code would be enough to support older versions.

Aurel