diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2013-10-09 10:01:09 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2013-10-09 10:01:09 +0000 |
| commit | ef6503643e7669a618e90c44f3dd453e2b7b81ec (patch) | |
| tree | 3de49b4380568dff4424e5a804ce9595d3005bfb /www/chromium/files/patch-media__base__audio_splicer.cc | |
| parent | Pass CONFIGURE_ENV to qmake (diff) | |
Update to 30.0.1599.66
Note that support for 10.0 is currently untested, WIP.
Submitted by: George Liaskos
Security: http://vuxml.org/freebsd/e5414d0c-2ade-11e3-821d-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-media__base__audio_splicer.cc')
| -rw-r--r-- | www/chromium/files/patch-media__base__audio_splicer.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-media__base__audio_splicer.cc b/www/chromium/files/patch-media__base__audio_splicer.cc index 3c187deac860..5ff429aa3e0e 100644 --- a/www/chromium/files/patch-media__base__audio_splicer.cc +++ b/www/chromium/files/patch-media__base__audio_splicer.cc @@ -1,5 +1,5 @@ ---- media/base/audio_splicer.cc.orig 2013-02-21 04:24:13.000000000 +0100 -+++ media/base/audio_splicer.cc 2013-02-26 12:33:35.000000000 +0100 +--- media/base/audio_splicer.cc.orig 2013-08-30 06:47:05.000000000 +0300 ++++ media/base/audio_splicer.cc 2013-09-03 22:08:02.140628065 +0300 @@ -60,7 +60,7 @@ base::TimeDelta expected_timestamp = output_timestamp_helper_.GetTimestamp(); base::TimeDelta delta = timestamp - expected_timestamp; @@ -11,10 +11,10 @@ } @@ -69,7 +69,7 @@ if (delta != base::TimeDelta()) - bytes_to_fill = output_timestamp_helper_.GetBytesToTarget(timestamp); + frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp); -- if (bytes_to_fill == 0 || std::abs(bytes_to_fill) < min_gap_size_) { -+ if (bytes_to_fill == 0 || std::labs(bytes_to_fill) < min_gap_size_) { +- if (frames_to_fill == 0 || std::abs(frames_to_fill) < min_gap_size_) { ++ if (frames_to_fill == 0 || std::labs(frames_to_fill) < min_gap_size_) { AddOutputBuffer(input); return true; } |