diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-23 19:56:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-23 19:56:37 +0100 |
| commit | 9a884b7b97c9780c84980560c88b3d3eca992101 (patch) | |
| tree | 3a3cdd1ba940e3feda20776743f54ff6fdecfdc1 | |
| parent | 9abe0bfb7f52d450c9c4b392d8c4b88007562b31 (diff) | |
| parent | 80239a8bb11f730d95f03dfbd0deab258b413b0e (diff) | |
Merge commit '80239a8bb11f730d95f03dfbd0deab258b413b0e' into release/2.2
* commit '80239a8bb11f730d95f03dfbd0deab258b413b0e':
af_channelmap: fix ONE_STR mapping mode
Merged-by: Michael Niedermayer <[email protected]>
| -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 e5e898703e..dac19b129d 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -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); } |