From: Clément Bœsch
---
libavcodec/ac3dec_fixed.c | 2 +-
libavcodec/ac3dec_float.c | 2 +-
libavcodec/ac3enc_opts_template.c | 4 ++--
libavcodec/alac.c | 2 +-
libavcodec/cinepakenc.c | 2 +-
libavcodec/dcadec.c | 4 ++--
libavcodec/dnxhdenc.c | 2 +-
libavcodec/dvbsubdec.c| 4 ++--
libavcodec/dvdsubdec.c| 2 +-
libavcodec/dvdsubenc.c| 2 +-
libavcodec/evrcdec.c | 2 +-
libavcodec/ffv1enc.c | 2 +-
libavcodec/fic.c | 2 +-
libavcodec/flacdec.c | 2 +-
libavcodec/flacenc.c | 4 ++--
libavcodec/frwu.c | 2 +-
libavcodec/g723_1.c | 2 +-
libavcodec/h264.c | 2 +-
libavcodec/hevc.c | 4 ++--
libavcodec/libvpxenc.c| 4 ++--
libavcodec/libx264.c | 22 +++---
libavcodec/libxavs.c | 8
libavcodec/mjpegdec.c | 2 +-
libavcodec/mpeg12enc.c| 10 +-
libavcodec/mpeg4videodec.c| 4 ++--
libavcodec/mpeg4videoenc.c| 4 ++--
libavcodec/mpegvideo_enc.c| 12 ++--
libavcodec/rawdec.c | 2 +-
libavcodec/snowenc.c | 4 ++--
29 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c
index 21756ea..6416da4 100644
--- a/libavcodec/ac3dec_fixed.c
+++ b/libavcodec/ac3dec_fixed.c
@@ -169,7 +169,7 @@ static void ac3_downmix_c_fixed16(int16_t **samples,
int16_t (*matrix)[2],
static const AVOption options[] = {
{ "drc_scale", "percentage of dynamic range compression to apply",
OFFSET(drc_scale), AV_OPT_TYPE_FLOAT, {.dbl = 1.0}, 0.0, 6.0, PAR },
-{ "heavy_compr", "heavy dynamic range compression enabled",
OFFSET(heavy_compression), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, PAR },
+{ "heavy_compr", "enable heavy dynamic range compression",
OFFSET(heavy_compression), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, PAR },
{ NULL},
};
diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c
index 6b46de2..0a5319a 100644
--- a/libavcodec/ac3dec_float.c
+++ b/libavcodec/ac3dec_float.c
@@ -33,7 +33,7 @@
static const AVOption options[] = {
{ "drc_scale", "percentage of dynamic range compression to apply",
OFFSET(drc_scale), AV_OPT_TYPE_FLOAT, {.dbl = 1.0}, 0.0, 6.0, PAR },
-{ "heavy_compr", "heavy dynamic range compression enabled",
OFFSET(heavy_compression), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, PAR },
+{ "heavy_compr", "enable heavy dynamic range compression",
OFFSET(heavy_compression), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, PAR },
{ "target_level", "target level in -dBFS (0 not applied)",
OFFSET(target_level), AV_OPT_TYPE_INT, {.i64 = 0 }, -31, 0, PAR },
{"dmix_mode", "Preferred Stereo Downmix Mode",
OFFSET(preferred_stereo_downmix), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 2, 0,
"dmix_mode"},
diff --git a/libavcodec/ac3enc_opts_template.c
b/libavcodec/ac3enc_opts_template.c
index 83113b8..57b65a7 100644
--- a/libavcodec/ac3enc_opts_template.c
+++ b/libavcodec/ac3enc_opts_template.c
@@ -25,7 +25,7 @@
static const AVOption ac3_options[] = {
/* Metadata Options */
-{"per_frame_metadata", "Allow Changing Metadata Per-Frame",
OFFSET(allow_per_frame_metadata), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1,
AC3ENC_PARAM},
+{"per_frame_metadata", "Allow Changing Metadata Per-Frame",
OFFSET(allow_per_frame_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1,
AC3ENC_PARAM},
#if AC3ENC_TYPE != AC3ENC_TYPE_EAC3
/* AC-3 downmix levels */
{"center_mixlev", "Center Mix Level", OFFSET(center_mix_level),
AV_OPT_TYPE_FLOAT, {.dbl = LEVEL_MINUS_4POINT5DB }, 0.0, 1.0, AC3ENC_PARAM},
@@ -68,7 +68,7 @@ static const AVOption ac3_options[] = {
{"standard", "Standard (default)", 0, AV_OPT_TYPE_CONST, {.i64 =
AC3ENC_OPT_ADCONV_STANDARD }, INT_MIN, INT_MAX, AC3ENC_PARAM, "ad_conv_type"},
{"hdcd", "HDCD", 0, AV_OPT_TYPE_CONST, {.i64 =
AC3ENC_OPT_ADCONV_HDCD }, INT_MIN, INT_MAX, AC3ENC_PARAM, "ad_conv_type"},
/* Other Encoding Options */
-{"stereo_rematrixing", "Stereo Rematrixing", OFFSET(stereo_rematrixing),
AV_OPT_TYPE_INT, {.i64 = AC3ENC_OPT_ON }, AC3ENC_OPT_OFF, AC3ENC_OPT_ON,
AC3ENC_PARAM},
+{"stereo_rematrixing", "Stereo Rematrixing", OFFSET(stereo_rematrixing),
AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, AC3ENC_PARAM},
{"channel_coupling", "Channel Coupling", OFFSET(channel_coupling),
AV_OPT_TYPE_INT, {.i64 = AC3ENC_OPT_AUTO }, AC3ENC_OPT_AUTO, AC3ENC_OPT_ON,
AC3ENC_PARAM, "channel_coupling"},
{"auto", "Selected by the Encoder", 0, AV_OPT_TYPE_CONST, {.i64 =
AC3ENC_OPT_AUTO }, INT_MIN, INT_MAX, AC3ENC_PARAM, "channel_coupling"},
{"cpl_start_band", "Coupling Start Band", OFFSET(cpl_start), AV_OPT_TYPE_INT,
{.i64 = AC3ENC_OPT_AUTO }, AC3ENC_OPT_AUTO, 15, AC3ENC_PARAM, "cpl_start_band"},
diff --git a/libavcod
