Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_colorlevels: Fix build failure on ARM

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

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by and commit message details-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
release/5.1
Michael Niedermayer 3 years ago
parent 6f231664ab
commit b9973b72c0
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      libavfilter/vf_colorlevels.c

16
libavfilter/vf_colorlevels.c
Unescape View File

@ -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) static int colorlevels_slice_9_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
ColorLevelsContext *s = ctx->priv; ColorLevelsContext *s = ctx->priv;
const int depth = s->depth; const int depth = 9;
DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) DO_COMMON(uint16_t, av_clip_uintp2, 0, 1)
return 0; 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) static int colorlevels_slice_10_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
ColorLevelsContext *s = ctx->priv; ColorLevelsContext *s = ctx->priv;
const int depth = s->depth; const int depth = 10;
DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) DO_COMMON(uint16_t, av_clip_uintp2, 0, 1)
return 0; 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) static int colorlevels_slice_12_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
ColorLevelsContext *s = ctx->priv; ColorLevelsContext *s = ctx->priv;
const int depth = s->depth; const int depth = 12;
DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) DO_COMMON(uint16_t, av_clip_uintp2, 0, 1)
return 0; 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) static int colorlevels_slice_14_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
ColorLevelsContext *s = ctx->priv; ColorLevelsContext *s = ctx->priv;
const int depth = s->depth; const int depth = 14;
DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) DO_COMMON(uint16_t, av_clip_uintp2, 0, 1)
return 0; 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) static int colorlevels_preserve_slice_9_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
ColorLevelsContext *s = ctx->priv; ColorLevelsContext *s = ctx->priv;
const int depth = s->depth; const int depth = 9;
DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) DO_COMMON(uint16_t, av_clip_uintp2, 1, 1)
return 0; 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) static int colorlevels_preserve_slice_10_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
ColorLevelsContext *s = ctx->priv; ColorLevelsContext *s = ctx->priv;
const int depth = s->depth; const int depth = 10;
DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) DO_COMMON(uint16_t, av_clip_uintp2, 1, 1)
return 0; 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) static int colorlevels_preserve_slice_12_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
ColorLevelsContext *s = ctx->priv; ColorLevelsContext *s = ctx->priv;
const int depth = s->depth; const int depth = 12;
DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) DO_COMMON(uint16_t, av_clip_uintp2, 1, 1)
return 0; 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) static int colorlevels_preserve_slice_14_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{ {
ColorLevelsContext *s = ctx->priv; ColorLevelsContext *s = ctx->priv;
const int depth = s->depth; const int depth = 14;
DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) DO_COMMON(uint16_t, av_clip_uintp2, 1, 1)
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save