From db0e7bd0bd1344b0edfd6a779e832fcd47cacd00 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 1 Jun 2012 15:12:03 -0400 Subject: lavr: mix: validate internal sample format in ff_audio_mix_init() --- libavresample/audio_mix.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libavresample/audio_mix.c') diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c index 93192221cd..2c2a356844 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -305,6 +305,14 @@ int ff_audio_mix_init(AVAudioResampleContext *avr) { int ret; + if (avr->internal_sample_fmt != AV_SAMPLE_FMT_S16P && + avr->internal_sample_fmt != AV_SAMPLE_FMT_FLTP) { + av_log(avr, AV_LOG_ERROR, "Unsupported internal format for " + "mixing: %s\n", + av_get_sample_fmt_name(avr->internal_sample_fmt)); + return AVERROR(EINVAL); + } + /* build matrix if the user did not already set one */ if (!avr->am->matrix) { int i, j; -- cgit v1.2.3