[FFmpeg-cvslog] af_channelmap: fix ONE_STR mapping mode

Anton Khirnov git at videolan.org
Mon Apr 21 16:56:30 CEST 2014


ffmpeg | branch: release/1.1 | Anton Khirnov <anton at khirnov.net> | Tue Mar  4 07:19:46 2014 +0100| [ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1] | committer: Sean McGovern

af_channelmap: fix ONE_STR mapping mode

get_channel() returns 0 on success

CC:libav-stable at libav.org

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

 libavfilter/af_channelmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;



More information about the ffmpeg-cvslog mailing list