From: Howard Chu <hyc@highlandsun.com>
Date: Tue, 18 May 2010 11:45:09 +0000 (+0000)
Subject: ffserver: Don't set me_method unconditionally
X-Git-Tag: v0.7b2~4449
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1bf5228eb63ad915acbb64209d940d867dd295d4;p=coroid%2Flibav_saccubus.git

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 628952a16..e1116f56c 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;