diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-01-10 14:25:56 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-01-10 14:25:56 +0100 |
| commit | f587ed0cbbda2de85d0fb34a4fdca89ccb1f1e61 (patch) | |
| tree | 798a1af85cc1d0c3e3c8eb7f18f2599d6a017b46 /libavcodec | |
| parent | fdb2d4b1084c92aa9bb1d2f948abdb86a361f219 (diff) | |
| download | ffmpeg-f587ed0cbbda2de85d0fb34a4fdca89ccb1f1e61.tar.gz | |
lavc/x264: Add compatibility values for coder options.
Fixes ticket #5142.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 2 |
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 }, |