Allow WEIGHTP_FAKE in interlaced mode
authorJason Garrett-Glaser <jason@x264.com>
Sat, 5 Feb 2011 23:02:34 +0000 (15:02 -0800)
committerJason Garrett-Glaser <jason@x264.com>
Mon, 7 Feb 2011 05:26:42 +0000 (21:26 -0800)
It seems to work fine as-is even though real weightp doesn't support interlacing yet.

encoder/encoder.c

index 3ff5897..782d34f 100644 (file)
@@ -774,7 +774,7 @@ static int x264_validate_parameters( x264_t *h )
     }
 
     h->param.analyse.i_weighted_pred = x264_clip3( h->param.analyse.i_weighted_pred, X264_WEIGHTP_NONE, X264_WEIGHTP_SMART );
-    if( !h->param.analyse.i_weighted_pred && h->param.rc.b_mb_tree && h->param.analyse.b_psy && !h->param.b_interlaced )
+    if( !h->param.analyse.i_weighted_pred && h->param.rc.b_mb_tree && h->param.analyse.b_psy )
         h->param.analyse.i_weighted_pred = X264_WEIGHTP_FAKE;
 
     if( h->i_thread_frames > 1 )