[SCM] libav/experimental: ffserver: Don't set me_method unconditionally

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 1bf5228eb63ad915acbb64209d940d867dd295d4
Author: Howard Chu <hyc at highlandsun.com>
Date:   Tue May 18 11:45:09 2010 +0000

    ffserver: Don't set me_method unconditionally
    
    Patch by Howard Chu, hyc at highlandsun dot com
    
    Originally committed as revision 23155 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffserver.c b/ffserver.c
index 628952a..e1116f5 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3843,6 +3843,7 @@ static void add_codec(FFStream *stream, AVCodecContext *av)
             av->nsse_weight = 8;
 
         av->frame_skip_cmp = FF_CMP_DCTMAX;
+        if (!av->me_method)
         av->me_method = ME_EPZS;
         av->rc_buffer_aggressivity = 1.0;
 

-- 
Libav/FFmpeg packaging