diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-02-27 12:23:19 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-02-29 07:13:58 +0100 |
commit | af3d804f9feebe34ad3815c501fba795b801cdd0 (patch) | |
tree | 65ed35dc0e5c52318fcf5c9728b1dda1466a2cf6 /libavcodec/options.c | |
parent | ff71a383ac884706903b2613d6f885021b69e552 (diff) | |
download | ffmpeg-af3d804f9feebe34ad3815c501fba795b801cdd0.tar.gz |
mpegvideo_enc: add cbp_rd flag to mpv_flags.
Deprecate CODEC_FLAG_CBP_RD.
Diffstat (limited to 'libavcodec/options.c')
-rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index de5b42a147..6b5b148516 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -97,8 +97,8 @@ static const AVOption options[]={ {"global_header", "place global headers in extradata instead of every keyframe", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_GLOBAL_HEADER }, INT_MIN, INT_MAX, V|A|E, "flags"}, {"bitexact", "use only bitexact stuff (except (i)dct)", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_BITEXACT }, INT_MIN, INT_MAX, A|V|S|D|E, "flags"}, {"aic", "h263 advanced intra coding / mpeg4 ac prediction", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_AC_PRED }, INT_MIN, INT_MAX, V|E, "flags"}, -{"cbp", "use rate distortion optimization for cbp", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_CBP_RD }, INT_MIN, INT_MAX, V|E, "flags"}, #if FF_API_MPV_GLOBAL_OPTS +{"cbp", "Deprecated, use mpegvideo private options instead", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_CBP_RD }, INT_MIN, INT_MAX, V|E, "flags"}, {"qprd", "Deprecated, use mpegvideo private options instead", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_QP_RD }, INT_MIN, INT_MAX, V|E, "flags"}, #endif {"ilme", "interlaced motion estimation", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_INTERLACED_ME }, INT_MIN, INT_MAX, V|E, "flags"}, |