Mercurial > libavcodec.hg

changeset 7766:10242bdaac34 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1000l Fix snow regression test that i broke in r15135.
author michael
date Mon, 01 Sep 2008 00:22:00 +0000
parents 72d421816e07
children f692318902dc
files motion_est.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/motion_est.c	Sun Aug 31 23:55:47 2008 +0000
+++ b/motion_est.c	Mon Sep 01 00:22:00 2008 +0000
@@ -240,7 +240,8 @@
         av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB diamond\n");
         return -1;
     }
-    if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1){
+    //special case of snow is needed because snow uses its own iterative ME code
+    if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1 && s->avctx->codec_id != CODEC_ID_SNOW){
         av_log(s->avctx, AV_LOG_ERROR, "me_method is only allowed to be set to zero and epzs; for hex,umh,full and others see dia_size\n");
         return -1;
     }