virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

resample: reject unhandled conversions

Browse Source 
audio_resample can not reduce the number of channels
This commit is contained in:
Janne Grunau
2011-10-23 00:31:16 +02:00
parent ec1ce86e7f
commit b2e56e08c9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/resample.c
View File

@@ -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;