Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-01-10 16:25:56 +0300
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-01-10 16:25:56 +0300
commitf587ed0cbbda2de85d0fb34a4fdca89ccb1f1e61 (patch)
tree798a1af85cc1d0c3e3c8eb7f18f2599d6a017b46 /libavcodec/libx264.c
parentfdb2d4b1084c92aa9bb1d2f948abdb86a361f219 (diff)
lavc/x264: Add compatibility values for coder options.
Fixes ticket #5142.
Diffstat (limited to 'libavcodec/libx264.c')
-rw-r--r--libavcodec/libx264.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 4dc531a168..88406a3765 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -953,6 +953,8 @@ static const AVOption options[] = {
{ "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, INT_MIN, INT_MAX, VE, "coder" },
{ "cavlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "coder" },
{ "cabac", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "coder" },
+ { "vlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "coder" },
+ { "ac", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "coder" },
{ "x264-params", "Override the x264 configuration using a :-separated list of key=value parameters", OFFSET(x264_params), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ NULL },