ffmpeg | branch: master | Vittorio Giovara <vittorio.giov...@gmail.com> | Tue Feb 16 12:12:23 2016 -0500| [0837d1dfe28f8c461e23404ecb11b0bde1d16af2] | committer: Vittorio Giovara
libx264: Fix noise_reduction option assignment First check the context, then check internal option. Drop the ! typo. Introduced in 60f0fde3092d18d4d36555962c192af8691a099c. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0837d1dfe28f8c461e23404ecb11b0bde1d16af2 --- libavcodec/libx264.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 7798ef3..8d72f1c 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -457,11 +457,11 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.analyse.i_me_range = avctx->me_range; #if FF_API_PRIVATE_OPT FF_DISABLE_DEPRECATION_WARNINGS - if (!x4->noise_reduction >= 0) + if (avctx->noise_reduction >= 0) x4->noise_reduction = avctx->noise_reduction; FF_ENABLE_DEPRECATION_WARNINGS #endif - if (!x4->noise_reduction >= 0) + if (x4->noise_reduction >= 0) x4->params.analyse.i_noise_reduction = x4->noise_reduction; if (avctx->me_subpel_quality >= 0) x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
