← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ffmpeg/vivid

« back to all changes in this revision

Viewing changes to libavfilter/af_channelmap.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun
  • Date: 2014-12-06 14:07:28 UTC
  • mfrom: (0.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20141206140728-to8fu8ywimaxu7ws
Tags: 7:2.5-1
* Import new major upstream release 2.5.
* Update debian/changelog.
* Add new symbols to the symbols files.
* Disable rtmp on powerpcspe and sparc64 as librtmp-dev is currently
  uninstallable there.
* Disable opencv on powerpcspe, as it is currently uninstallable.
* Enable x265 on mips, mipsel and powerpc, as it's now available there.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavfilter/af_channelmap.c
287
287
static int channelmap_query_formats(AVFilterContext *ctx)
288
288
{
289
289
    ChannelMapContext *s = ctx->priv;
 
290
    AVFilterChannelLayouts *layouts;
290
291
 
291
292
    ff_set_common_formats(ctx, ff_planar_sample_fmts());
292
293
    ff_set_common_samplerates(ctx, ff_all_samplerates());
293
 
    ff_channel_layouts_ref(ff_all_channel_layouts(), &ctx->inputs[0]->out_channel_layouts);
 
294
 
 
295
    layouts = ff_all_channel_layouts();
 
296
    if (!layouts)
 
297
        return AVERROR(ENOMEM);
 
298
 
 
299
    ff_channel_layouts_ref(layouts, &ctx->inputs[0]->out_channel_layouts);
294
300
    ff_channel_layouts_ref(s->channel_layouts,       &ctx->outputs[0]->in_channel_layouts);
295
301
 
296
302
    return 0;