ffmpeg-effect: use amerge instead of amix ffmpeg filter - annna - Annna the nice friendly bot.
 (HTM) git clone git://bitreich.org/annna/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/annna/
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Tags
 (DIR) README
       ---
 (DIR) commit add54ddd2d5bd41f9f35f56043dd561d6f8248f4
 (DIR) parent 1282bf31a4795703c93c269a0340b97f9f766387
 (HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
       Date:   Sat, 12 Jun 2021 19:58:18 +0200
       
       ffmpeg-effect: use amerge instead of amix ffmpeg filter
       
       Signed-off-by: Annna Robert-Houdin <annna@bitreich.org>
       
       Diffstat:
         M ffmpeg-effect                       |       4 ++--
       
       1 file changed, 2 insertions(+), 2 deletions(-)
       ---
 (DIR) diff --git a/ffmpeg-effect b/ffmpeg-effect
       @@ -54,12 +54,12 @@ process_filter() {
                        sexify)
                                $ffmpeg_common -i "$2" \
                                        -i "${mediadir}/careless_whisper.mp3" \
       -                                -filter_complex "amix=inputs=2:duration=shortest:weights=3 2" \
       +                                -filter_complex "amerge=inputs=2" \
                                        "$3" </dev/null;;
                        scrollify)
                                $ffmpeg_common -i "$2" \
                                        -i "${mediadir}/elder_scrolls.mp3" \
       -                                -filter_complex "amix=inputs=2:duration=shortest:weights=3 2" \
       +                                -filter_complex "amerge=inputs=2" \
                                        "$3" </dev/null;;
                        sendtohell|amsterdamify)
                                $ffmpeg_common -i "$2" \