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:32:24 +0200 |
| commit | c5dd0bc4ca977924825a74080ff1c294dda01427 (patch) | |
| tree | f3a5e105ff0a9e18f490f4db607c31eaa45966d5 /libavcodec/options.c | |
| parent | d4b967131842e7c225e5f83cb82337d4474a0bb7 (diff) | |
| download | ffmpeg-c5dd0bc4ca977924825a74080ff1c294dda01427.tar.gz | |
libx264: add 'weightp' private option.
Deprecate corresponding global option.
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 00a4376957..6d40ef0b5b 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -141,7 +141,9 @@ static const AVOption options[]={ {"b_qfactor", "qp factor between p and b frames", OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E}, {"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, {.dbl = 0 }, INT_MIN, INT_MAX, V|E}, -{"wpredp", "weighted prediction analysis method", OFFSET(weighted_p_pred), FF_OPT_TYPE_INT, {.dbl = 0 }, INT_MIN, INT_MAX, V|E}, +#if FF_API_X264_GLOBAL_OPTS +{"wpredp", "weighted prediction analysis method", OFFSET(weighted_p_pred), FF_OPT_TYPE_INT, {.dbl = -1 }, INT_MIN, INT_MAX, V|E}, +#endif {"ps", "rtp payload size in bytes", OFFSET(rtp_payload_size), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"mv_bits", NULL, OFFSET(mv_bits), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"header_bits", NULL, OFFSET(header_bits), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, |