Bug 1341254 - Put the modification made to the resampler code in
bug 1274083 into their own patch, and add this patch to update.sh. r?karlt
MozReview-Commit-ID: IAOWdGS0jM
new file mode 100644
--- /dev/null
+++ b/media/libspeex_resampler/set-rate-overflow-no-return.patch
@@ -0,0 +1,23 @@
+--- a/media/libspeex_resampler/src/resample.c
++++ b/media/libspeex_resampler/src/resample.c
+@@ -1146,17 +1146,19 @@ EXPORT int speex_resampler_set_rate_frac
+ }
+ }
+
+ if (old_den > 0)
+ {
+ for (i=0;i<st->nb_channels;i++)
+ {
+ if (!_muldiv_safe(st->samp_frac_num[i],st->den_rate,old_den))
+- return RESAMPLER_ERR_OVERFLOW;
++ {
++ st->samp_frac_num[i] = st->den_rate-1;
++ }
+ st->samp_frac_num[i]= _muldiv(st->samp_frac_num[i],st->den_rate,old_den);
+ /* Safety net */
+ if (st->samp_frac_num[i] >= st->den_rate)
+ st->samp_frac_num[i] = st->den_rate-1;
+ }
+ }
+
+ if (st->initialised)
--- a/media/libspeex_resampler/update.sh
+++ b/media/libspeex_resampler/update.sh
@@ -22,8 +22,9 @@ cp $1/COPYING .
# apply outstanding local patches
patch -p3 < outside-speex.patch
patch -p3 < simd-detect-runtime.patch
patch -p3 < set-skip-frac.patch
patch -p3 < hugemem.patch
patch -p3 < remove-empty-asm-clobber.patch
patch -p3 < handle-memory-error.patch
patch -p3 < fix-overflow.patch
+patch -p3 < set-rate-overflow-no-return.patch