[FFmpeg-cvslog] lavc/x264: Add compatibility values for coder options.

Carl Eugen Hoyos git at videolan.org
Sun Jan 10 14:26:52 CET 2016


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Jan 10 14:25:56 2016 +0100| [f587ed0cbbda2de85d0fb34a4fdca89ccb1f1e61] | committer: Carl Eugen Hoyos

lavc/x264: Add compatibility values for coder options.

Fixes ticket #5142.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f587ed0cbbda2de85d0fb34a4fdca89ccb1f1e61
---

 libavcodec/libx264.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 4dc531a..88406a3 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 },



More information about the ffmpeg-cvslog mailing list