diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 11:56:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 11:57:45 +0200 |
| commit | 9c31b396413a90f55e82a01cb6b6f1fbe048a156 (patch) | |
| tree | 4a725a911462670c4be576e2f1aefc47e5aeaa5b /libavfilter | |
| parent | 40e8ade9ebda8286a0291c575c874755670ce81f (diff) | |
| parent | 22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4 (diff) | |
| download | ffmpeg-9c31b396413a90f55e82a01cb6b6f1fbe048a156.tar.gz | |
Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'
* commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4':
af_channelmap: properly set the supported output channel layouts
Conflicts:
libavfilter/af_channelmap.c
See: 39867f3e098ab304cd3bef0ace19d73617cdb817
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_channelmap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 06931456fb..dae79c14b6 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -57,7 +57,6 @@ enum MappingMode { #define MAX_CH 64 typedef struct ChannelMapContext { const AVClass *class; - AVFilterChannelLayouts *channel_layouts; char *mapping_str; char *channel_layout_str; uint64_t output_layout; @@ -289,6 +288,9 @@ static int channelmap_query_formats(AVFilterContext *ctx) { ChannelMapContext *s = ctx->priv; AVFilterChannelLayouts *layouts; + AVFilterChannelLayouts *channel_layouts = NULL; + + ff_add_channel_layout(&channel_layouts, s->output_layout); ff_set_common_formats(ctx, ff_planar_sample_fmts()); ff_set_common_samplerates(ctx, ff_all_samplerates()); @@ -297,9 +299,8 @@ static int channelmap_query_formats(AVFilterContext *ctx) if (!layouts) return AVERROR(ENOMEM); - ff_add_channel_layout(&s->channel_layouts, s->output_layout); ff_channel_layouts_ref(layouts, &ctx->inputs[0]->out_channel_layouts); - ff_channel_layouts_ref(s->channel_layouts, &ctx->outputs[0]->in_channel_layouts); + ff_channel_layouts_ref(channel_layouts, &ctx->outputs[0]->in_channel_layouts); return 0; } |