# HG changeset patch
# User lorenm
# Date 1260319102 0
# Node ID 80161fd66fd17e6620fca4f4a07c58b08eefb6ae
# Parent  85b5e57f59593fc9804675b9fc6161d9725d36f4
revert r20775, because equivalent code has been committed to x264 instead

diff -r 85b5e57f5959 -r 80161fd66fd1 libx264.c
--- a/libx264.c	Wed Dec 09 00:24:33 2009 +0000
+++ b/libx264.c	Wed Dec 09 00:38:22 2009 +0000
@@ -159,7 +159,7 @@
     x4->params.rc.i_bitrate         = avctx->bit_rate       / 1000;
     x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000;
     x4->params.rc.i_vbv_max_bitrate = avctx->rc_max_rate    / 1000;
-    x4->params.rc.b_stat_write      = !!(avctx->flags & CODEC_FLAG_PASS1);
+    x4->params.rc.b_stat_write      = avctx->flags & CODEC_FLAG_PASS1;
     if (avctx->flags & CODEC_FLAG_PASS2) {
         x4->params.rc.b_stat_read = 1;
     } else {
@@ -190,7 +190,7 @@
 
     x4->params.i_scenecut_threshold        = avctx->scenechange_threshold;
 
-    x4->params.b_deblocking_filter         = !!(avctx->flags & CODEC_FLAG_LOOP_FILTER);
+    x4->params.b_deblocking_filter         = avctx->flags & CODEC_FLAG_LOOP_FILTER;
     x4->params.i_deblocking_filter_alphac0 = avctx->deblockalpha;
     x4->params.i_deblocking_filter_beta    = avctx->deblockbeta;
 
@@ -227,7 +227,7 @@
 
     x4->params.analyse.i_direct_mv_pred  = avctx->directpred;
 
-    x4->params.analyse.b_weighted_bipred = !!(avctx->flags2 & CODEC_FLAG2_WPRED);
+    x4->params.analyse.b_weighted_bipred = avctx->flags2 & CODEC_FLAG2_WPRED;
     x4->params.analyse.i_weighted_pred = avctx->weighted_p_pred;
 
     if (avctx->me_method == ME_EPZS)
@@ -245,10 +245,10 @@
     x4->params.analyse.i_me_range         = avctx->me_range;
     x4->params.analyse.i_subpel_refine    = avctx->me_subpel_quality;
 
-    x4->params.analyse.b_mixed_references = !!(avctx->flags2 & CODEC_FLAG2_MIXED_REFS);
-    x4->params.analyse.b_chroma_me        = !!(avctx->me_cmp & FF_CMP_CHROMA);
-    x4->params.analyse.b_transform_8x8    = !!(avctx->flags2 & CODEC_FLAG2_8X8DCT);
-    x4->params.analyse.b_fast_pskip       = !!(avctx->flags2 & CODEC_FLAG2_FASTPSKIP);
+    x4->params.analyse.b_mixed_references = avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
+    x4->params.analyse.b_chroma_me        = avctx->me_cmp & FF_CMP_CHROMA;
+    x4->params.analyse.b_transform_8x8    = avctx->flags2 & CODEC_FLAG2_8X8DCT;
+    x4->params.analyse.b_fast_pskip       = avctx->flags2 & CODEC_FLAG2_FASTPSKIP;
 
     x4->params.analyse.i_trellis          = avctx->trellis;
     x4->params.analyse.i_noise_reduction  = avctx->noise_reduction;
@@ -271,14 +271,14 @@
     x4->params.rc.f_pb_factor             = avctx->b_quant_factor;
     x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
 
-    x4->params.analyse.b_psnr = !!(avctx->flags & CODEC_FLAG_PSNR);
+    x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
     x4->params.i_log_level    = X264_LOG_DEBUG;
 
-    x4->params.b_aud          = !!(avctx->flags2 & CODEC_FLAG2_AUD);
+    x4->params.b_aud          = avctx->flags2 & CODEC_FLAG2_AUD;
 
     x4->params.i_threads      = avctx->thread_count;
 
-    x4->params.b_interlaced   = !!(avctx->flags & CODEC_FLAG_INTERLACED_DCT);
+    x4->params.b_interlaced   = avctx->flags & CODEC_FLAG_INTERLACED_DCT;
 
     if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER)
         x4->params.b_repeat_headers = 0;