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:11:02 +0100 |
commit | a249f0cc23457bc73a249e1b1ca22adcfe5b0894 (patch) | |
tree | 86ee5bc4444e24cdd5befcd7e854b032b32c28b6 /libavcodec/options.c | |
parent | ed019b8e5bfefe59e307ce01f2860777e037b94b (diff) | |
download | ffmpeg-a249f0cc23457bc73a249e1b1ca22adcfe5b0894.tar.gz |
mpegvideo_enc: add strict_gop flag to mpv_flags.
Deprecate CODEC_FLAG2_STRICT_GOP.
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 fb48030ebc..8374f9d487 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -102,7 +102,9 @@ static const AVOption options[]={ {"ilme", "interlaced motion estimation", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_INTERLACED_ME }, INT_MIN, INT_MAX, V|E, "flags"}, {"cgop", "closed gop", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_CLOSED_GOP }, INT_MIN, INT_MAX, V|E, "flags"}, {"fast", "allow non spec compliant speedup tricks", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_FAST }, INT_MIN, INT_MAX, V|E, "flags2"}, -{"sgop", "strictly enforce gop size", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_STRICT_GOP }, INT_MIN, INT_MAX, V|E, "flags2"}, +#if FF_API_MPV_GLOBAL_OPTS +{"sgop", "Deprecated, use mpegvideo private options instead", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_STRICT_GOP }, INT_MIN, INT_MAX, V|E, "flags2"}, +#endif {"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"}, {"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"}, {"sub_id", NULL, OFFSET(sub_id), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, |