[FFmpeg-devel] [RFC]Change rematrix_maxval default to 1.0

Carl Eugen Hoyos cehoyos at ag.or.at
Mon May 18 00:09:54 CEST 2015


Hi!

Attached patch as suggested by Hendrik might fix ticket #4564.

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/doc/resampler.texi b/doc/resampler.texi
index f9eef03..c73d402 100644
--- a/doc/resampler.texi
+++ b/doc/resampler.texi
@@ -66,8 +66,8 @@ Set rematrix volume. Default value is 1.0.
 
 @item rematrix_maxval
 Set maximum output value for rematrixing.
-This can be used to prevent clipping vs. preventing volumn reduction
-A value of 1.0 prevents cliping.
+This can be used to prevent clipping vs. preventing volume reduction
+The default value of 1.0 prevents cliping.
 
 @item flags, swr_flags
 Set flags used by the converter. Default value is 0.
diff --git a/libswresample/options.c b/libswresample/options.c
index de84672..b755222 100644
--- a/libswresample/options.c
+++ b/libswresample/options.c
@@ -62,7 +62,7 @@ static const AVOption options[]={
 {"lfe_mix_level"        , "set LFE mix level"           , OFFSET(lfe_mix_level  ), AV_OPT_TYPE_FLOAT, {.dbl=0                     }, -32    , 32        , PARAM},
 {"rmvol"                , "set rematrix volume"         , OFFSET(rematrix_volume), AV_OPT_TYPE_FLOAT, {.dbl=1.0                   }, -1000  , 1000      , PARAM},
 {"rematrix_volume"      , "set rematrix volume"         , OFFSET(rematrix_volume), AV_OPT_TYPE_FLOAT, {.dbl=1.0                   }, -1000  , 1000      , PARAM},
-{"rematrix_maxval"      , "set rematrix maxval"         , OFFSET(rematrix_maxval), AV_OPT_TYPE_FLOAT, {.dbl=0.0                   }, 0      , 1000      , PARAM},
+{"rematrix_maxval"      , "set rematrix maxval"         , OFFSET(rematrix_maxval), AV_OPT_TYPE_FLOAT, {.dbl=1.0                   }, 0      , 1000      , PARAM},
 
 {"flags"                , "set flags"                   , OFFSET(flags          ), AV_OPT_TYPE_FLAGS, {.i64=0                     }, 0      , UINT_MAX  , PARAM, "flags"},
 {"swr_flags"            , "set flags"                   , OFFSET(flags          ), AV_OPT_TYPE_FLAGS, {.i64=0                     }, 0      , UINT_MAX  , PARAM, "flags"},


More information about the ffmpeg-devel mailing list