diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-02-16 12:12:23 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-02-22 19:06:48 -0500 |
| commit | 0837d1dfe28f8c461e23404ecb11b0bde1d16af2 (patch) | |
| tree | 0d72e9418624672d7b704d5e09b2315405075b13 /libavcodec/libx264.c | |
| parent | ec4c48397641dbaf4ae8df36c32aaa5a311a11bf (diff) | |
| download | ffmpeg-0837d1dfe28f8c461e23404ecb11b0bde1d16af2.tar.gz | |
libx264: Fix noise_reduction option assignment
First check the context, then check internal option. Drop the ! typo.
Introduced in 60f0fde3092d18d4d36555962c192af8691a099c.
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 7798ef3648..8d72f1caa0 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; |