~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/resample.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
162
162
               MAX_CHANNELS);
163
163
        return NULL;
164
164
    }
165
 
    if (output_channels > 2 &&
166
 
        !(output_channels == 6 && input_channels == 2) &&
167
 
        output_channels != input_channels) {
 
165
    if (output_channels != input_channels &&
 
166
        (input_channels  > 2 ||
 
167
         output_channels > 2 &&
 
168
         !(output_channels == 6 && input_channels == 2))) {
168
169
        av_log(NULL, AV_LOG_ERROR,
169
170
               "Resampling output channel count must be 1 or 2 for mono input; 1, 2 or 6 for stereo input; or N for N channel input.\n");
170
171
        return NULL;
213
214
        }
214
215
    }
215
216
 
216
 
#define TAPS 16
217
217
    s->resample_context = av_resample_init(output_rate, input_rate,
218
218
                                           filter_length, log2_phase_count,
219
219
                                           linear, cutoff);