aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/options.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-08-27 10:16:14 +0200
committerAnton Khirnov <anton@khirnov.net>2011-08-31 13:28:11 +0200
commit0d904de89ded7502c7a18a12e27c3e6dff5d1fdf (patch)
tree23ca72527c8016820fe10f33cd184c4be5281b4a /libavcodec/options.c
parente3922d1110772baee10def844367f961c8c728d5 (diff)
downloadffmpeg-0d904de89ded7502c7a18a12e27c3e6dff5d1fdf.tar.gz
h263/p encoder: add 'obmc' private option.
Deprecate CODEC_FLAG_OBMC
Diffstat (limited to 'libavcodec/options.c')
-rw-r--r--libavcodec/options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c
index fb1fb17f9a..8ac3d959fe 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -75,7 +75,9 @@ static const AVOption options[]={
{"bt", "set video bitrate tolerance (in bits/s)", OFFSET(bit_rate_tolerance), FF_OPT_TYPE_INT, {.dbl = AV_CODEC_DEFAULT_BITRATE*20 }, 1, INT_MAX, V|E},
{"flags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, 0, UINT_MAX, V|A|E|D, "flags"},
{"mv4", "use four motion vector by macroblock (mpeg4)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_4MV }, INT_MIN, INT_MAX, V|E, "flags"},
+#if FF_API_MPEGVIDEO_GLOBAL_OPTS
{"obmc", "use overlapped block motion compensation (h263+)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_OBMC }, INT_MIN, INT_MAX, V|E, "flags"},
+#endif
{"qpel", "use 1/4 pel motion compensation", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"},
{"loop", "use loop filter", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"},
{"qscale", "use fixed qscale", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"},