aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-04-14 12:10:50 +0200
committerAnton Khirnov <anton@khirnov.net>2013-04-17 08:37:59 +0200
commitc0771a1ac6da697f86e3b10c8fe5dbc2ee92e347 (patch)
tree7791b28c9e31b3734e38437649f5acf8d9d67d3c
parentaafed1175df76603e94c99a7748968780d6548d2 (diff)
downloadffmpeg-c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347.tar.gz
af_channelmap: cosmetics, use an extra local variable to shorten the code
-rw-r--r--libavfilter/af_channelmap.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index c626a21fd6..9e1fa76fa4 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -362,24 +362,25 @@ static int channelmap_config_input(AVFilterLink *inlink)
char layout_name[256];
for (i = 0; i < s->nch; i++) {
+ struct ChannelMap *m = &s->map[i];
+
if (s->mode == MAP_PAIR_STR_INT || s->mode == MAP_PAIR_STR_STR) {
- s->map[i].in_channel_idx = av_get_channel_layout_channel_index(
- inlink->channel_layout, s->map[i].in_channel);
+ m->in_channel_idx = av_get_channel_layout_channel_index(
+ inlink->channel_layout, m->in_channel);
}
- if (s->map[i].in_channel_idx < 0 ||
- s->map[i].in_channel_idx >= nb_channels) {
+ if (m->in_channel_idx < 0 || m->in_channel_idx >= nb_channels) {
av_get_channel_layout_string(layout_name, sizeof(layout_name),
0, inlink->channel_layout);
- if (s->map[i].in_channel) {
- channel_name = av_get_channel_name(s->map[i].in_channel);
+ if (m->in_channel) {
+ channel_name = av_get_channel_name(m->in_channel);
av_log(ctx, AV_LOG_ERROR,
"input channel '%s' not available from input layout '%s'\n",
channel_name, layout_name);
} else {
av_log(ctx, AV_LOG_ERROR,
"input channel #%d not available from input layout '%s'\n",
- s->map[i].in_channel_idx, layout_name);
+ m->in_channel_idx, layout_name);
}
err = AVERROR(EINVAL);
}