summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Valin <jmvalin@jmvalin.ca>2013-07-02 16:35:02 -0400
committerJean-Marc Valin <jmvalin@jmvalin.ca>2013-07-02 16:35:02 -0400
commitfc66793e1f7b19a2981754ca57b8499cd422c4ef (patch)
treeed5ac71d3fd57fb64de4e8e2fe2c2d702a714b1c
parentf7ad6fe30a7659afa8c0fad0a9a4952a0f83d36b (diff)
downloadopus-1.0.x.tar.gz
Adds some checks to the surround APIv1.0.31.0.x
-rw-r--r--src/opus_multistream.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/opus_multistream.c b/src/opus_multistream.c
index 9493ca31..a126b16f 100644
--- a/src/opus_multistream.c
+++ b/src/opus_multistream.c
@@ -272,6 +272,8 @@ int opus_multistream_surround_encoder_init(
int application
)
{
+ if ((channels>255) || (channels<1))
+ return OPUS_BAD_ARG;
st->lfe_stream = -1;
if (mapping_family==0)
{
@@ -306,9 +308,8 @@ int opus_multistream_surround_encoder_init(
mapping[i] = i;
} else
return OPUS_UNIMPLEMENTED;
- opus_multistream_encoder_init_impl(st, Fs, channels, *streams, *coupled_streams,
+ return opus_multistream_encoder_init_impl(st, Fs, channels, *streams, *coupled_streams,
mapping, application, channels>2&&mapping_family==1);
- return OPUS_OK;
}
OpusMSEncoder *opus_multistream_encoder_create(