aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-12-06 17:25:57 -0500
committerGitHub <noreply@github.com>2018-12-06 17:25:57 -0500
commit3c19cd49ec2ef0e8608faf9575d9fbee2391a867 (patch)
tree7d0ce4849b03cde675d777fcd9c665e3ae87a161
parenta2c4eba72014d143b2b1a442441bbce0f0b2200e (diff)
parent0be42a45cd94ac1b05fe418b840cf20f19b4e603 (diff)
downloadservo-3c19cd49ec2ef0e8608faf9575d9fbee2391a867.tar.gz
servo-3c19cd49ec2ef0e8608faf9575d9fbee2391a867.zip
Auto merge of #22377 - ferjm:servo.media.update, r=jdm
Update servo-media. Fixes discarded frames during player setup - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22377) <!-- Reviewable:end -->
-rw-r--r--Cargo.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock
index ca360d631e9..67a4409f166 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3528,7 +3528,7 @@ dependencies = [
[[package]]
name = "servo-media"
version = "0.1.0"
-source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451"
+source = "git+https://github.com/servo/media#a3a2e8586074227f2e4b175c94f759df3690b195"
dependencies = [
"servo-media-audio 0.1.0 (git+https://github.com/servo/media)",
"servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)",
@@ -3538,7 +3538,7 @@ dependencies = [
[[package]]
name = "servo-media-audio"
version = "0.1.0"
-source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451"
+source = "git+https://github.com/servo/media#a3a2e8586074227f2e4b175c94f759df3690b195"
dependencies = [
"boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3555,7 +3555,7 @@ dependencies = [
[[package]]
name = "servo-media-gstreamer"
version = "0.1.0"
-source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451"
+source = "git+https://github.com/servo/media#a3a2e8586074227f2e4b175c94f759df3690b195"
dependencies = [
"byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3573,7 +3573,7 @@ dependencies = [
[[package]]
name = "servo-media-player"
version = "0.1.0"
-source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451"
+source = "git+https://github.com/servo/media#a3a2e8586074227f2e4b175c94f759df3690b195"
dependencies = [
"ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3660,7 +3660,7 @@ dependencies = [
[[package]]
name = "servo_media_derive"
version = "0.1.0"
-source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451"
+source = "git+https://github.com/servo/media#a3a2e8586074227f2e4b175c94f759df3690b195"
dependencies = [
"proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",