Merge commit '80239a8bb11f730d95f03dfbd0deab258b413b0e' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 18:56:37 +0000 (19:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 18:56:37 +0000 (19:56 +0100)
* commit '80239a8bb11f730d95f03dfbd0deab258b413b0e':
  af_channelmap: fix ONE_STR mapping mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_channelmap.c

index e5e8987..dac19b1 100644 (file)
@@ -184,7 +184,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);
             }