[FFmpeg-cvslog] vf_deshake: Reorder constant arguments in an if() statement.

Carl Eugen Hoyos git at videolan.org
Wed Apr 3 12:54:44 CEST 2013


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Apr  3 12:52:38 2013 +0200| [6e90d9e2066ab35a72d4053de3e0cdc5a342ac67] | committer: Carl Eugen Hoyos

vf_deshake: Reorder constant arguments in an if() statement.

Fixes compilation with clang on netbsd with --disable-optimizations.

Tested-by: Paul B Mahol

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e90d9e2066ab35a72d4053de3e0cdc5a342ac67
---

 libavfilter/vf_deshake.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c
index ee6e474..c8b8775 100644
--- a/libavfilter/vf_deshake.c
+++ b/libavfilter/vf_deshake.c
@@ -370,7 +370,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
         return AVERROR(EINVAL);
     }
 
-    if (deshake->opencl && CONFIG_OPENCL) {
+    if (CONFIG_OPENCL && deshake->opencl) {
         deshake->transform = ff_opencl_transform;
         ret = ff_opencl_deshake_init(ctx);
         if (ret < 0)
@@ -415,7 +415,7 @@ static int config_props(AVFilterLink *link)
 static av_cold void uninit(AVFilterContext *ctx)
 {
     DeshakeContext *deshake = ctx->priv;
-    if (deshake->opencl && CONFIG_OPENCL) {
+    if (CONFIG_OPENCL && deshake->opencl) {
         ff_opencl_deshake_uninit(ctx);
     }
     av_frame_free(&deshake->ref);
@@ -444,7 +444,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
     }
     av_frame_copy_props(out, in);
 
-    if (deshake->opencl && CONFIG_OPENCL) {
+    if (CONFIG_OPENCL && deshake->opencl) {
         ret = ff_opencl_deshake_process_inout_buf(link->dst,in, out);
         if (ret < 0)
             return ret;



More information about the ffmpeg-cvslog mailing list