Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always...

[ffmpeg] / libavcodec / x264.c

diff --git a/libavcodec/x264.c b/libavcodec/x264.c
index 31fe5cc65b2e03701ede6d0c4f604b4c7b947e92..ddd29e748496059cd0bd3936e108e4b5d0ea1c47 100644 (file)
--- a/libavcodec/x264.c
+++ b/libavcodec/x264.c
@@ -222,10 +222,11 @@ X264_init(AVCodecContext *avctx)
     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;
 
     if(avctx->level > 0) x4->params.i_level_idc = avctx->level;
 
-    x4->params.rc.f_rate_tolerance = 
+    x4->params.rc.f_rate_tolerance =
         (float)avctx->bit_rate_tolerance/avctx->bit_rate;
 
     if((avctx->rc_buffer_size != 0) &&
@@ -258,14 +259,14 @@ X264_init(AVCodecContext *avctx)
     avctx->coded_frame = &x4->out_pic;
 
     if(avctx->flags & CODEC_FLAG_GLOBAL_HEADER){
-       x264_nal_t *nal;
-       int nnal, i, s = 0;
+        x264_nal_t *nal;
+        int nnal, i, s = 0;
 
-       x264_encoder_headers(x4->enc, &nal, &nnal);
+        x264_encoder_headers(x4->enc, &nal, &nnal);
 
-       /* 5 bytes NAL header + worst case escaping */
-       for(i = 0; i < nnal; i++)
-           s += 5 + nal[i].i_payload * 4 / 3;
+        /* 5 bytes NAL header + worst case escaping */
+        for(i = 0; i < nnal; i++)
+            s += 5 + nal[i].i_payload * 4 / 3;
 
         avctx->extradata = av_malloc(s);
         avctx->extradata_size = encode_nals(avctx->extradata, s, nal, nnal);