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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1
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 c4b87da..c39207e 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -197,7 +197,7 @@ static av_cold int channelmap_init(AVFilterContext *ctx, const char *args)
             s->map[i].out_channel_idx = i;
             break;
         case MAP_ONE_STR:
-            if (!get_channel(&mapping, &in_ch, ',')) {
+            if (get_channel(&mapping, &in_ch, ',') < 0) {
                 av_log(ctx, AV_LOG_ERROR, err);
                 ret = AVERROR(EINVAL);
                 goto fail;

-- 
Libav/FFmpeg packaging