diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 12:47:42 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 13:05:06 +0200 |
| commit | 7e7dc1489f5e7b3810935f17ec3c9a7ca2beb68a (patch) | |
| tree | 4f3c63ffa92f6a6644bc2f9225f3d263d5ce6da3 | |
| parent | a1e798ef0a5f5c4cfa58cef436a02e07fb238733 (diff) | |
| download | ffmpeg-7e7dc1489f5e7b3810935f17ec3c9a7ca2beb68a.tar.gz | |
lavfi/curves: make possible to customize presets.
| -rw-r--r-- | doc/filters.texi | 5 | ||||
| -rw-r--r-- | libavfilter/vf_curves.c | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 3d40b4f9d7..04f75c17b0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2371,8 +2371,9 @@ The filter accepts the following options: @table @option @item preset -Select one of the available color presets. This option can not be used in -addition to the @option{r}, @option{g}, @option{b} parameters. +Select one of the available color presets. This option can be used in addition +to the @option{r}, @option{g}, @option{b} parameters; in this case, the later +options takes priority on the preset values. Available presets are: @table @samp @item none diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index d0a8ebc4e3..378754dfba 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -333,14 +333,9 @@ static av_cold int init(AVFilterContext *ctx, const char *args) } if (curves->preset != PRESET_NONE) { - if (pts[0] || pts[1] || pts[2]) { - av_log(ctx, AV_LOG_ERROR, "It is not possible to mix a preset " - "with explicit points placements\n"); - return AVERROR(EINVAL); - } - pts[0] = av_strdup(curves_presets[curves->preset].r); - pts[1] = av_strdup(curves_presets[curves->preset].g); - pts[2] = av_strdup(curves_presets[curves->preset].b); + if (!pts[0]) pts[0] = av_strdup(curves_presets[curves->preset].r); + if (!pts[1]) pts[1] = av_strdup(curves_presets[curves->preset].g); + if (!pts[2]) pts[2] = av_strdup(curves_presets[curves->preset].b); if (!pts[0] || !pts[1] || !pts[2]) return AVERROR(ENOMEM); } |