diff options
| author | Howard Chu <hyc@highlandsun.com> | 2010-05-18 11:45:09 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-05-18 11:45:09 +0000 |
| commit | 1bf5228eb63ad915acbb64209d940d867dd295d4 (patch) | |
| tree | 57404977b1bb7b4ddd4a093b22781ea592008161 /ffserver.c | |
| parent | 0156fcf25210660d85cacf413efc839ec7412eca (diff) | |
| download | ffmpeg-1bf5228eb63ad915acbb64209d940d867dd295d4.tar.gz | |
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
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |