diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 23:27:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 23:57:07 +0200 |
| commit | 052f4f859cfee9bb86ea3ccb0c56ea11d050ef17 (patch) | |
| tree | 118f522d94de18bcf855c526026d6c18cf5c6b3d /libavfilter/vf_lut.c | |
| parent | 37b5959d9689f5310640c7a0beaa7784c58bfa6f (diff) | |
| parent | a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a (diff) | |
| download | ffmpeg-052f4f859cfee9bb86ea3ccb0c56ea11d050ef17.tar.gz | |
Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'
* commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a':
lavfi: remove 'opaque' parameter from AVFilter.init()
mov: do not try to read total disc/track number if data atom is too short.
avconv: fix -force_key_frames
dxva2_h264: fix signaling of mbaff frames
x86: fft: elf64: fix PIC build
Conflicts:
ffmpeg.c
libavcodec/v210dec.h
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_overlay.c
libavfilter/vsrc_color.c
libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_lut.c')
| -rw-r--r-- | libavfilter/vf_lut.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 47dd7f3ccf..252aac18cc 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -93,7 +93,7 @@ static const AVOption lut_options[] = { AVFILTER_DEFINE_CLASS(lut); -static int init(AVFilterContext *ctx, const char *args, void *opaque) +static int init(AVFilterContext *ctx, const char *args) { LutContext *lut = ctx->priv; int ret; @@ -368,7 +368,7 @@ DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table to the RGB input vid #if CONFIG_NEGATE_FILTER -static int negate_init(AVFilterContext *ctx, const char *args, void *opaque) +static int negate_init(AVFilterContext *ctx, const char *args) { LutContext *lut = ctx->priv; char lut_params[64]; @@ -381,7 +381,7 @@ static int negate_init(AVFilterContext *ctx, const char *args, void *opaque) snprintf(lut_params, sizeof(lut_params), "c0=negval:c1=negval:c2=negval:a=%s", lut->negate_alpha ? "negval" : "val"); - return init(ctx, lut_params, opaque); + return init(ctx, lut_params); } DEFINE_LUT_FILTER(negate, "Negate input video.", negate_init); |