[libav-commits] lavr: mix: validate internal sample format in ff_audio_mix_init()

Justin Ruggles git at libav.org
Sun Jul 8 22:49:44 CEST 2012


Module: libav
Branch: master
Commit: db0e7bd0bd1344b0edfd6a779e832fcd47cacd00

Author:    Justin Ruggles <justin.ruggles at gmail.com>
Committer: Justin Ruggles <justin.ruggles at gmail.com>
Date:      Fri Jun  1 15:12:03 2012 -0400

lavr: mix: validate internal sample format in ff_audio_mix_init()

---

 libavresample/audio_mix.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c
index 9319222..2c2a356 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;



More information about the libav-commits mailing list