[FFmpeg-cvslog] r23155 - trunk/ffserver.c

[mstorsjo]

Author: mstorsjo
Date: Tue May 18 13:45:09 2010
New Revision: 23155

Log:
ffserver: Don't set me_method unconditionally

Patch by Howard Chu, hyc at highlandsun dot com

Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Tue May 18 13:16:12 2010	(r23154)
+++ trunk/ffserver.c	Tue May 18 13:45:09 2010	(r23155)
@@ -3843,6 +3843,7 @@ static void add_codec(FFStream *stream, 
             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;