Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'

* commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5':
  af_aformat: cosmetics, fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-18 12:22:13 +02:00
commit 4742edd50e

View File

@ -110,7 +110,7 @@ static int query_formats(AVFilterContext *ctx)
AFormatContext *s = ctx->priv; AFormatContext *s = ctx->priv;
ff_set_common_formats(ctx, s->formats ? s->formats : ff_set_common_formats(ctx, s->formats ? s->formats :
ff_all_formats(AVMEDIA_TYPE_AUDIO)); ff_all_formats(AVMEDIA_TYPE_AUDIO));
ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates : ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates :
ff_all_samplerates()); ff_all_samplerates());
ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts : ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts :