← Back to branch summary

~ubuntu-branches/debian/experimental/libav/experimental

« back to all changes in this revision

Viewing changes to libavresample/audio_convert.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-08-17 22:33:40 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20140817223340-net3rzywma60pzhz
Tags: 6:11~beta1-1
http://bugs.debian.org/758447
* New upstream Release v11~alpha2
* build against libgnutls28-dev (Closes: #758447)
* Bump shlibs

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavresample/audio_convert.c
345
345
    if (ac->apply_map) {
346
346
        ChannelMapInfo *map = &ac->avr->ch_map_info;
347
347
 
348
 
        if (!av_sample_fmt_is_planar(ac->out_fmt)) {
 
348
        if (!ff_sample_fmt_is_planar(ac->out_fmt, ac->channels)) {
349
349
            av_log(ac->avr, AV_LOG_ERROR, "cannot remap packed format during conversion\n");
350
350
            return AVERROR(EINVAL);
351
351
        }
352
352
 
353
353
        if (map->do_remap) {
354
 
            if (av_sample_fmt_is_planar(ac->in_fmt)) {
 
354
            if (ff_sample_fmt_is_planar(ac->in_fmt, ac->channels)) {
355
355
                conv_func_flat *convert = use_generic ? ac->conv_flat_generic :
356
356
                                                        ac->conv_flat;
357
357