Merge commit 'dca23ffbc7568c9af5c5fbaa86e6a0761ecae50c'

[ffmpeg] / libavfilter / vf_removegrain.c

diff --git a/libavfilter/vf_removegrain.c b/libavfilter/vf_removegrain.c
index da17f6a5addc01828de987c73a7f140e0f9c5dbc..3a28b15cdbe99a673bf2f05aca6a3ad1c762c89a 100644 (file)
--- a/libavfilter/vf_removegrain.c
+++ b/libavfilter/vf_removegrain.c
@@ -24,6 +24,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/qsort.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
@@ -92,7 +93,7 @@ static int mode02(int c, int a1, int a2, int a3, int a4, int a5, int a6, int a7,
 {
     int a[8] = { a1, a2, a3, a4, a5, a6, a7, a8 };
 
-    qsort(&a, 8, sizeof(a[0]), cmp_int);
+    AV_QSORT(a, 8, int, cmp_int);
 
     return av_clip(c, a[2 - 1 ], a[7 - 1]);
 }
@@ -101,7 +102,7 @@ static int mode03(int c, int a1, int a2, int a3, int a4, int a5, int a6, int a7,
 {
     int a[8] = { a1, a2, a3, a4, a5, a6, a7, a8 };
 
-    qsort(&a, 8, sizeof(a[0]), cmp_int);
+    AV_QSORT(a, 8, int, cmp_int);
 
     return av_clip(c, a[3 - 1 ], a[6 - 1]);
 }
@@ -110,7 +111,7 @@ static int mode04(int c, int a1, int a2, int a3, int a4, int a5, int a6, int a7,
 {
     int a[8] = { a1, a2, a3, a4, a5, a6, a7, a8 };
 
-    qsort(&a, 8, sizeof(a[0]), cmp_int);
+    AV_QSORT(a, 8, int, cmp_int);
 
     return av_clip(c, a[4 - 1 ], a[5 - 1]);
 }