Browse Source

Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'

* commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4':
  af_channelmap: properly set the supported output channel layouts

Conflicts:
	libavfilter/af_channelmap.c

See: 39867f3e09
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.8
Michael Niedermayer 10 years ago
parent
commit
9c31b39641
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      libavfilter/af_channelmap.c

+ 4
- 3
libavfilter/af_channelmap.c View File

@@ -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;
}


Loading…
Cancel
Save