From: Fiona Glaser <fiona@x264.com>
Date: Sat, 12 Jul 2008 20:10:38 +0000 (-0600)
Subject: Limit MVrange correctly in interlaced mode
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=299820827918a7586e40dac9f9dd62221350506d;p=libx264

Limit MVrange correctly in interlaced mode
Bug report by Sigma Designs, Inc.
---

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 8f1ebacc..fb34ca87 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -504,9 +504,9 @@ static int x264_validate_parameters( x264_t *h )
             return -1;
         }
         if( h->param.analyse.i_mv_range <= 0 )
-            h->param.analyse.i_mv_range = l->mv_range;
+            h->param.analyse.i_mv_range = l->mv_range >> h->param.b_interlaced;
         else
-            h->param.analyse.i_mv_range = x264_clip3(h->param.analyse.i_mv_range, 32, 512);
+            h->param.analyse.i_mv_range = x264_clip3(h->param.analyse.i_mv_range, 32, 512 >> h->param.b_interlaced);
         if( h->param.analyse.i_direct_8x8_inference < 0 )
             h->param.analyse.i_direct_8x8_inference = l->direct8x8;
     }