---
 libavcodec/options_table.h | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index cf1f20a..62f2a08 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -25,6 +25,7 @@
 #include <stdint.h>
 
 #include "libavutil/opt.h"
+#include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "version.h"
 #include "config.h"
@@ -377,7 +378,34 @@ static const AVOption avcodec_options[] = {
 {"request_channels", "set desired number of audio channels", 
OFFSET(request_channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D},
 #endif
 {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, 
{.i64 = DEFAULT }, INT_MIN, INT_MAX},
-{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = 
DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout"},
+{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = 
DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout_type"},
+{"mono", "Mono", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_MONO }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"st", "Stereo", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_STEREO }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"2_1", "2.1", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_2POINT1 }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"3_0", "3.0", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_SURROUND }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"3_0_back", "3.0 (back)", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_2_1 }, 
INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"4_0", "4.0", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_4POINT0 }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"quad", "quad", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_QUAD }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"quad_size", "quad (side)", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_2_2 }, 
INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"3_1", "3.1", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_3POINT1 }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"5_0", "5.0", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_5POINT0_BACK }, 
INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"5_0_side", "5.0 (side)", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_5POINT0 
}, INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"4_1", "4.1", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_4POINT1 }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"5_1", "5.1", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_5POINT1_BACK }, 
INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"5_1_side", "5.1 (side)", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_5POINT1 
}, INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"6_0", "6.0", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_6POINT0 }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"6_0_front", "6.0 (front)", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CH_LAYOUT_6POINT0_FRONT }, INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"hex", "hexagonal", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_HEXAGONAL }, 
INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"6_1", "6.1", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_6POINT1 }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"6_1_back", "6.1 (back)", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CH_LAYOUT_6POINT1_BACK }, INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"6_1_front", "6.1 (front)", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CH_LAYOUT_6POINT1_FRONT }, INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"7_0", "7.0", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_7POINT0 }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"7_0_front", "7.0 (front)", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CH_LAYOUT_7POINT0_FRONT }, INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"7_1", "7.1", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_7POINT1 }, INT_MIN, 
INT_MAX, A|E|D, "channel_layout_type"},
+{"7_1_wide", "7.1 (wide)", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CH_LAYOUT_7POINT1_WIDE_BACK }, INT_MIN, INT_MAX, A|E|D, 
"channel_layout_type"},
+{"7_1_wide_side", "7.1 (wide-side)", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CH_LAYOUT_7POINT1_WIDE }, INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"oct", "Octagonal", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CH_LAYOUT_OCTAGONAL }, 
INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
+{"downmix", "Downmix", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CH_LAYOUT_STEREO_DOWNMIX }, INT_MIN, INT_MAX, A|E|D, "channel_layout_type"},
 {"request_channel_layout", NULL, OFFSET(request_channel_layout), 
AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|D, 
"request_channel_layout"},
 {"rc_max_vbv_use", NULL, OFFSET(rc_max_available_vbv_use), AV_OPT_TYPE_FLOAT, 
{.dbl = 1.0/3 }, 0.0, FLT_MAX, V|E},
 {"rc_min_vbv_use", NULL, OFFSET(rc_min_vbv_overflow_use),  AV_OPT_TYPE_FLOAT, 
{.dbl = 3 },     0.0, FLT_MAX, V|E},
-- 
2.1.0

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to