diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:42:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:42:24 +0200 |
| commit | cb29eb144b81cfded4d7c9a9220f45834b3d4612 (patch) | |
| tree | 5141c39459092d546938a3be0ba6b5c9f4959de3 /libavfilter | |
| parent | 2ce46a959c20ee72ad276e4b02bd50b522e1362a (diff) | |
| parent | ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1 (diff) | |
| download | ffmpeg-cb29eb144b81cfded4d7c9a9220f45834b3d4612.tar.gz | |
Merge commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1' into release/1.1
* commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1':
af_channelmap: fix ONE_STR mapping mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_channelmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 09d2de21f6..398b3dd0e5 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -196,7 +196,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; |