From 1bf5228eb63ad915acbb64209d940d867dd295d4 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@highlandsun.com>
Date: Tue, 18 May 2010 11:45:09 +0000
Subject: [PATCH] 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
---
 ffserver.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ffserver.c b/ffserver.c
index 628952a163..e1116f56c7 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;