Mark Bergsma has submitted this change and it was merged.
Change subject: Import 1.1.0-1+wmf1
......................................................................
Import 1.1.0-1+wmf1
* Backport libvpx 1.1.0 to precise
* debian/patches/03_altref_calculation.patch
+ Fix timestamp calculation rollover w/altref
(https://gerrit.chromium.org/gerrit/#/c/29547/)
Change-Id: Id7a4a0266555758b7cc5a5968a60c2a4e416e793
---
M debian/changelog
A debian/patches/03_altref_calculation.patch
M debian/patches/series
3 files changed, 42 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
Faidon: Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 5f74a47..410e7bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libvpx (1.1.0-1+wmf1) precise; urgency=low
+
+ * Backport libvpx 1.1.0 to precise
+
+ * debian/patches/03_altref_calculation.patch
+ + Fix timestamp calculation rollover w/altref
+ (https://gerrit.chromium.org/gerrit/#/c/29547/)
+
+ -- Jan Gerber <[email protected]> Tue, 02 Apr 2013 17:42:04 +0200
+
libvpx (1.1.0-1) unstable; urgency=low
* New upstream release, "Eider".
diff --git a/debian/patches/03_altref_calculation.patch
b/debian/patches/03_altref_calculation.patch
new file mode 100644
index 0000000..9da55fd
--- /dev/null
+++ b/debian/patches/03_altref_calculation.patch
@@ -0,0 +1,31 @@
+commit 429743c56b77f5f9e3d0599ea0b7ffa42d867e3d
+Author: James Zern <[email protected]>
+Date: Tue Aug 7 17:12:10 2012 -0700
+
+ fix timestamp calculation rollover w/altref
+
+ using large values for the timebase, e.g., {33333, 1000000} could
+ rollover the timestamp calculation in vp8e_encode as it was not using
+ 64-bit math.
+
+ originally reported on ffmpeg's trac:
+ https://ffmpeg.org/trac/ffmpeg/ticket/1014
+
+ BUG=468
+
+ Change-Id: Iedb4e11de086a3dda75097bfaf08f2488e2088d8
+
+diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
+index 072314f..7db82c0 100644
+--- a/vp8/vp8_cx_iface.c
++++ b/vp8/vp8_cx_iface.c
+@@ -891,7 +891,8 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t
*ctx,
+ VP8_COMP *cpi = (VP8_COMP *)ctx->cpi;
+
+ /* Add the frame packet to the list of returned packets. */
+- round = 1000000 * ctx->cfg.g_timebase.num / 2 - 1;
++ round = (vpx_codec_pts_t)1000000
++ * ctx->cfg.g_timebase.num / 2 - 1;
+ delta = (dst_end_time_stamp - dst_time_stamp);
+ pkt.kind = VPX_CODEC_CX_FRAME_PKT;
+ pkt.data.frame.pts =
diff --git a/debian/patches/series b/debian/patches/series
index 1639d38..8a8e5db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_enable-shared.patch
fix-armhf-link.patch
+03_altref_calculation.patch
--
To view, visit https://gerrit.wikimedia.org/r/58520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7a4a0266555758b7cc5a5968a60c2a4e416e793
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/libvpx
Gerrit-Branch: master
Gerrit-Owner: J <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
