diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-05 01:57:35 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-05 01:57:35 +0000 |
| commit | 89223ef6989fb2da0a7a20009ca4111cbcfaef05 (patch) | |
| tree | e9a4d72414c3582dca4a5b90dfdcf1177f7a7337 /libavcodec/libx264.c | |
| parent | 03b9d94e8609146f961b924e032ac7c0036a5e0f (diff) | |
| download | ffmpeg-89223ef6989fb2da0a7a20009ca4111cbcfaef05.tar.gz | |
add esa/dia compat me options and new tesa for libx264
Originally committed as revision 13660 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 78fe81a593..c02a696465 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -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; |