[SCM] libav/experimental: af_channelmap: fix ONE_STR mapping mode

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:02:09 UTC 2014


The following commit has been merged in the experimental branch:
commit e843612695007cc623813073754c651ab43021f7
Author: Anton Khirnov <anton at khirnov.net>
Date:   Tue Mar 4 07:19:46 2014 +0100

    af_channelmap: fix ONE_STR mapping mode
    
    get_channel() returns 0 on success
    
    CC:libav-stable at libav.org

diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index 71d51e7..3e5cc3d 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -188,7 +188,7 @@ static av_cold int channelmap_init(AVFilterContext *ctx)
             s->map[i].out_channel_idx = i;
             break;
         case MAP_ONE_STR:
-            if (!get_channel(&mapping, &in_ch, separator)) {
+            if (get_channel(&mapping, &in_ch, separator) < 0) {
                 av_log(ctx, AV_LOG_ERROR, err);
                 return AVERROR(EINVAL);
             }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list