[FFmpeg-cvslog] avfilter/acrossfade: use AV_OPT_TYPE_BOOL for overlap option

Clément Bœsch git at videolan.org
Wed Sep 9 01:32:48 CEST 2015


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Sep  9 01:25:49 2015 +0200| [14355873730229a48b6cb0c4eb845189d32a4808] | committer: Clément Bœsch

avfilter/acrossfade: use AV_OPT_TYPE_BOOL for overlap option

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

 libavfilter/af_afade.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c
index a599b62..c35978f 100644
--- a/libavfilter/af_afade.c
+++ b/libavfilter/af_afade.c
@@ -347,8 +347,8 @@ static const AVOption acrossfade_options[] = {
     { "ns",           "set number of samples for cross fade duration", OFFSET(nb_samples),   AV_OPT_TYPE_INT,    {.i64 = 44100}, 1, INT32_MAX/10, FLAGS },
     { "duration",     "set cross fade duration",                       OFFSET(duration),     AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, 60, FLAGS },
     { "d",            "set cross fade duration",                       OFFSET(duration),     AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, 60, FLAGS },
-    { "overlap",      "overlap 1st stream end with 2nd stream start",  OFFSET(overlap),      AV_OPT_TYPE_INT,    {.i64 = 1    }, 0,  1, FLAGS },
-    { "o",            "overlap 1st stream end with 2nd stream start",  OFFSET(overlap),      AV_OPT_TYPE_INT,    {.i64 = 1    }, 0,  1, FLAGS },
+    { "overlap",      "overlap 1st stream end with 2nd stream start",  OFFSET(overlap),      AV_OPT_TYPE_BOOL,   {.i64 = 1    }, 0,  1, FLAGS },
+    { "o",            "overlap 1st stream end with 2nd stream start",  OFFSET(overlap),      AV_OPT_TYPE_BOOL,   {.i64 = 1    }, 0,  1, FLAGS },
     { "curve1",       "set fade curve type for 1st stream",            OFFSET(curve),        AV_OPT_TYPE_INT,    {.i64 = TRI  }, 0, NB_CURVES - 1, FLAGS, "curve1" },
     { "c1",           "set fade curve type for 1st stream",            OFFSET(curve),        AV_OPT_TYPE_INT,    {.i64 = TRI  }, 0, NB_CURVES - 1, FLAGS, "curve1" },
     {     "tri",      "linear slope",                                  0,                    AV_OPT_TYPE_CONST,  {.i64 = TRI  }, 0, 0, FLAGS, "curve1" },



More information about the ffmpeg-cvslog mailing list