diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-22 07:55:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-24 14:31:07 +0200 |
| commit | 2a44a8f6091913bad14c4df318ceeb68dc4a9258 (patch) | |
| tree | 1b0e1da35f70c0932c71f33f0c49e9a80f206876 /libavcodec/options.c | |
| parent | 93e623c642d3966b74bd0b4913357527123546f5 (diff) | |
| download | ffmpeg-2a44a8f6091913bad14c4df318ceeb68dc4a9258.tar.gz | |
libx264: add 'psy_trellis' private option.
Deprecate corresponding global option.
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index a7b904993a..365f8608ad 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -439,9 +439,7 @@ static const AVOption options[]={ {"psy", "use psycho visual optimization", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_PSY }, INT_MIN, INT_MAX, V|E, "flags2"}, #if FF_API_X264_GLOBAL_OPTS {"psy_rd", "specify psycho visual strength", OFFSET(psy_rd), FF_OPT_TYPE_FLOAT, {.dbl = -1.0 }, -1, FLT_MAX, V|E}, -#endif -{"psy_trellis", "specify psycho visual trellis", OFFSET(psy_trellis), FF_OPT_TYPE_FLOAT, {.dbl = 0 }, 0, FLT_MAX, V|E}, -#if FF_API_X264_GLOBAL_OPTS +{"psy_trellis", "specify psycho visual trellis", OFFSET(psy_trellis), FF_OPT_TYPE_FLOAT, {.dbl = -1 }, -1, FLT_MAX, V|E}, {"aq_mode", "specify aq method", OFFSET(aq_mode), FF_OPT_TYPE_INT, {.dbl = -1 }, -1, INT_MAX, V|E}, {"aq_strength", "specify aq strength", OFFSET(aq_strength), FF_OPT_TYPE_FLOAT, {.dbl = -1.0 }, -1, FLT_MAX, V|E}, #endif |