# HG changeset patch # User Jean-Yves Avenard # Date 1522080430 -7200 # Node ID d465b211dd0713daa68461d6fb8a76e34ea7aed9 # Parent 31a88710f63d3f64a890e594907b6926eecfb7d3 Bug 1448883 - Resync with cubeb 7401fc25a9d. r=padenot MozReview-Commit-ID: 1Lg0fpsSa10 diff --git a/media/libcubeb/README_MOZILLA b/media/libcubeb/README_MOZILLA --- a/media/libcubeb/README_MOZILLA +++ b/media/libcubeb/README_MOZILLA @@ -1,8 +1,8 @@ The source from this directory was copied from the cubeb git repository using the update.sh script. The only changes made were those applied by update.sh and the addition of Makefile.in build files for the Mozilla build system. The cubeb git repository is: git://github.com/kinetiknz/cubeb.git -The git commit ID used was 7712aaabfa140e8c7fe890e3f5f65dfe3fe58632 (2018-03-25 11:30:38 +0200) +The git commit ID used was 7401fc25a9d87ed57d49648883e3e5658305c1cb (2018-03-26 16:54:01 +0200) diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c --- a/media/libcubeb/src/cubeb.c +++ b/media/libcubeb/src/cubeb.c @@ -63,17 +63,17 @@ int kai_init(cubeb ** context, char cons static int validate_stream_params(cubeb_stream_params * input_stream_params, cubeb_stream_params * output_stream_params) { XASSERT(input_stream_params || output_stream_params); if (output_stream_params) { if (output_stream_params->rate < 1000 || output_stream_params->rate > 192000 || - output_stream_params->channels < 1 || output_stream_params->channels > 8) { + output_stream_params->channels < 1) { return CUBEB_ERROR_INVALID_FORMAT; } } if (input_stream_params) { if (input_stream_params->rate < 1000 || input_stream_params->rate > 192000 || input_stream_params->channels < 1 || input_stream_params->channels > 8) { return CUBEB_ERROR_INVALID_FORMAT; }