Commit 0837d1df authored by Vittorio Giovara's avatar Vittorio Giovara

libx264: Fix noise_reduction option assignment

First check the context, then check internal option. Drop the ! typo.
Introduced in 60f0fde3.
parent ec4c4839
...@@ -457,11 +457,11 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -457,11 +457,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
x4->params.analyse.i_me_range = avctx->me_range; x4->params.analyse.i_me_range = avctx->me_range;
#if FF_API_PRIVATE_OPT #if FF_API_PRIVATE_OPT
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (!x4->noise_reduction >= 0) if (avctx->noise_reduction >= 0)
x4->noise_reduction = avctx->noise_reduction; x4->noise_reduction = avctx->noise_reduction;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
if (!x4->noise_reduction >= 0) if (x4->noise_reduction >= 0)
x4->params.analyse.i_noise_reduction = x4->noise_reduction; x4->params.analyse.i_noise_reduction = x4->noise_reduction;
if (avctx->me_subpel_quality >= 0) if (avctx->me_subpel_quality >= 0)
x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment