ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun 
Mar  6 17:05:39 2022 +0100| [b9973b72c0a904229318e4d549d17a1a774b8623] | 
committer: Michael Niedermayer

avfilter/vf_colorlevels: Fix build failure on ARM

This fixes building for arm after 10c2ef1ca41dbe7811f0588f4163c8cf7b8fda66.
The argument to av_clip_uintp2 must be an assembly time immediate
constant.

Reviewed-by: Paul B Mahol <[email protected]>
Reviewed-by and commit message details-by: Martin Storsjö <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>

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

 libavfilter/vf_colorlevels.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavfilter/vf_colorlevels.c b/libavfilter/vf_colorlevels.c
index a8859795dd..76adfbd8c8 100644
--- a/libavfilter/vf_colorlevels.c
+++ b/libavfilter/vf_colorlevels.c
@@ -219,7 +219,7 @@ static int colorlevels_slice_8_planar(AVFilterContext *ctx, 
void *arg, int jobnr
 static int colorlevels_slice_9_planar(AVFilterContext *ctx, void *arg, int 
jobnr, int nb_jobs)
 {
     ColorLevelsContext *s = ctx->priv;
-    const int depth = s->depth;
+    const int depth = 9;
     DO_COMMON(uint16_t, av_clip_uintp2, 0, 1)
     return 0;
 }
@@ -227,7 +227,7 @@ static int colorlevels_slice_9_planar(AVFilterContext *ctx, 
void *arg, int jobnr
 static int colorlevels_slice_10_planar(AVFilterContext *ctx, void *arg, int 
jobnr, int nb_jobs)
 {
     ColorLevelsContext *s = ctx->priv;
-    const int depth = s->depth;
+    const int depth = 10;
     DO_COMMON(uint16_t, av_clip_uintp2, 0, 1)
     return 0;
 }
@@ -235,7 +235,7 @@ static int colorlevels_slice_10_planar(AVFilterContext 
*ctx, void *arg, int jobn
 static int colorlevels_slice_12_planar(AVFilterContext *ctx, void *arg, int 
jobnr, int nb_jobs)
 {
     ColorLevelsContext *s = ctx->priv;
-    const int depth = s->depth;
+    const int depth = 12;
     DO_COMMON(uint16_t, av_clip_uintp2, 0, 1)
     return 0;
 }
@@ -243,7 +243,7 @@ static int colorlevels_slice_12_planar(AVFilterContext 
*ctx, void *arg, int jobn
 static int colorlevels_slice_14_planar(AVFilterContext *ctx, void *arg, int 
jobnr, int nb_jobs)
 {
     ColorLevelsContext *s = ctx->priv;
-    const int depth = s->depth;
+    const int depth = 14;
     DO_COMMON(uint16_t, av_clip_uintp2, 0, 1)
     return 0;
 }
@@ -265,7 +265,7 @@ static int 
colorlevels_preserve_slice_8_planar(AVFilterContext *ctx, void *arg,
 static int colorlevels_preserve_slice_9_planar(AVFilterContext *ctx, void 
*arg, int jobnr, int nb_jobs)
 {
     ColorLevelsContext *s = ctx->priv;
-    const int depth = s->depth;
+    const int depth = 9;
     DO_COMMON(uint16_t, av_clip_uintp2, 1, 1)
     return 0;
 }
@@ -273,7 +273,7 @@ static int 
colorlevels_preserve_slice_9_planar(AVFilterContext *ctx, void *arg,
 static int colorlevels_preserve_slice_10_planar(AVFilterContext *ctx, void 
*arg, int jobnr, int nb_jobs)
 {
     ColorLevelsContext *s = ctx->priv;
-    const int depth = s->depth;
+    const int depth = 10;
     DO_COMMON(uint16_t, av_clip_uintp2, 1, 1)
     return 0;
 }
@@ -281,7 +281,7 @@ static int 
colorlevels_preserve_slice_10_planar(AVFilterContext *ctx, void *arg,
 static int colorlevels_preserve_slice_12_planar(AVFilterContext *ctx, void 
*arg, int jobnr, int nb_jobs)
 {
     ColorLevelsContext *s = ctx->priv;
-    const int depth = s->depth;
+    const int depth = 12;
     DO_COMMON(uint16_t, av_clip_uintp2, 1, 1)
     return 0;
 }
@@ -289,7 +289,7 @@ static int 
colorlevels_preserve_slice_12_planar(AVFilterContext *ctx, void *arg,
 static int colorlevels_preserve_slice_14_planar(AVFilterContext *ctx, void 
*arg, int jobnr, int nb_jobs)
 {
     ColorLevelsContext *s = ctx->priv;
-    const int depth = s->depth;
+    const int depth = 14;
     DO_COMMON(uint16_t, av_clip_uintp2, 1, 1)
     return 0;
 }

_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".

Reply via email to