diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-18 01:33:09 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-18 01:54:40 +0200 |
commit | fae714a9fbff876c4cacfe7d437c940d557b44ce (patch) | |
tree | a902e7f012153f96582d2eecdfb78def1c0260a1 /libavfilter/vf_lut.c | |
parent | 9be937d38dac1ccf16fa8a7c0f9098bad5bb0431 (diff) | |
parent | 3ec344626c4ec2f515169f89bffe95dea92a5982 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: add presets
rtsp: Expose the flag options via private AVOptions for sdp and rtp, too
rtsp: Make the rtsp flags avoptions set via a define
rtpenc: Set a default video codec
avoptions: Fix av_opt_flag_is_set
rtp: Fix ff_rtp_get_payload_type
doc: Update the documentation on setting options for RTSP
rtsp: Remove the separate filter_source variable
rtsp: Accept options via private avoptions instead of URL options
rtsp: Simplify AVOption definitions
rtsp: Merge the AVOption lists
lavfi: port libmpcodecs delogo filter
lavfi: port boxblur filter from libmpcodecs
lavfi: add negate filter
lavfi: add LUT (LookUp Table) generic filters
AVOptions: don't segfault on NULL parameter in av_set_options_string()
avio: Check for invalid buffer length.
mpegenc/mpegtsenc: add muxrate private options.
lavf: deprecate AVFormatContext.file_size
mov: add support for TV metadata atoms tves, tvsn and stik
Conflicts:
Changelog
doc/filters.texi
doc/protocols.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfilter.h
libavfilter/formats.c
libavfilter/internal.h
libavfilter/vf_boxblur.c
libavfilter/vf_delogo.c
libavfilter/vf_lut.c
libavformat/mpegtsenc.c
libavformat/utils.c
libavformat/version.h
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_lut.c')
-rw-r--r-- | libavfilter/vf_lut.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index b9ade20bcc..211a294e43 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -350,21 +350,27 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { .name = NULL}}, \ } +#if CONFIG_LUT_FILTER DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input video.", init); +#endif +#if CONFIG_LUTYUV_FILTER DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input video.", init); +#endif +#if CONFIG_LUTRGB_FILTER DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table to the RGB input video.", init); +#endif #if CONFIG_NEGATE_FILTER static int negate_init(AVFilterContext *ctx, const char *args, void *opaque) { LutContext *lut = ctx->priv; - char lut_params[1024]; + char lut_params[64]; if (args) sscanf(args, "%d", &lut->negate_alpha); - av_log(ctx, AV_LOG_INFO, "negate_alpha:%d\n", lut->negate_alpha); + av_log(ctx, AV_LOG_DEBUG, "negate_alpha:%d\n", lut->negate_alpha); snprintf(lut_params, sizeof(lut_params), "c0=negval:c1=negval:c2=negval:a=%s", lut->negate_alpha ? "negval" : "val"); @@ -374,4 +380,4 @@ static int negate_init(AVFilterContext *ctx, const char *args, void *opaque) DEFINE_LUT_FILTER(negate, "Negate input video.", negate_init); -#endif +#endif
\ No newline at end of file |