diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-03 14:35:17 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-03 14:35:17 -0500 |
| commit | a57983a2176afb4bab3c22efa6a24d39f3c11163 (patch) | |
| tree | 56dbcb66e07d997d817e40c1fd8005ee75142e8b /media/libcubeb/disable-assert.patch | |
| parent | 6513e41cb75e64384f35470d59ad6a4f88092e82 (diff) | |
| parent | 1960d6e08a949ceed50e6a18240d40a7ecee879c (diff) | |
| download | UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.gz UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.lz UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.xz UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.zip | |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'media/libcubeb/disable-assert.patch')
| -rw-r--r-- | media/libcubeb/disable-assert.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/media/libcubeb/disable-assert.patch b/media/libcubeb/disable-assert.patch deleted file mode 100644 index 6fae3a766..000000000 --- a/media/libcubeb/disable-assert.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/media/libcubeb/src/cubeb_resampler.cpp b/media/libcubeb/src/cubeb_resampler.cpp ---- a/media/libcubeb/src/cubeb_resampler.cpp -+++ b/media/libcubeb/src/cubeb_resampler.cpp -@@ -50,18 +50,17 @@ passthrough_resampler<T>::passthrough_re - - template<typename T> - long passthrough_resampler<T>::fill(void * input_buffer, long * input_frames_count, - void * output_buffer, long output_frames) - { - if (input_buffer) { - assert(input_frames_count); - } -- assert((input_buffer && output_buffer && -- *input_frames_count + static_cast<int>(samples_to_frames(internal_input_buffer.length())) >= output_frames) || -+ assert((input_buffer && output_buffer) || - (output_buffer && !input_buffer && (!input_frames_count || *input_frames_count == 0)) || - (input_buffer && !output_buffer && output_frames == 0)); - - if (input_buffer) { - if (!output_buffer) { - output_frames = *input_frames_count; - } - internal_input_buffer.push(static_cast<T*>(input_buffer), |