Module: libav Branch: master Commit: b2e56e08c90a89c5566a1a391fec7c3136d49e3c
Author: Janne Grunau <[email protected]> Committer: Janne Grunau <[email protected]> Date: Sun Oct 23 00:31:16 2011 +0200 resample: reject unhandled conversions audio_resample can not reduce the number of channels --- libavcodec/resample.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/resample.c b/libavcodec/resample.c index fce6272..ba8ce89 100644 --- a/libavcodec/resample.c +++ b/libavcodec/resample.c @@ -162,9 +162,10 @@ ReSampleContext *av_audio_resample_init(int output_channels, int input_channels, MAX_CHANNELS); return NULL; } - if (output_channels > 2 && - !(output_channels == 6 && input_channels == 2) && - output_channels != input_channels) { + if (output_channels != input_channels && + (input_channels > 2 || + output_channels > 2 && + !(output_channels == 6 && input_channels == 2))) { av_log(NULL, AV_LOG_ERROR, "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"); return NULL; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
