diff --git a/.travis.yml b/.travis.yml index 44bb3c52ccb..7796d98cd23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,9 @@ matrix: - xorg-dev - ccache - libdbus-glib-1-dev + - libavformat-dev + - libavcodec-dev + - libavutil-dev branches: only: diff --git a/README.md b/README.md index 0af2c5032a9..887a638c063 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,8 @@ sudo apt-get install git curl freeglut3-dev autoconf \ libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \ gperf g++ build-essential cmake virtualenv python-pip \ libssl-dev libbz2-dev libosmesa6-dev libxmu6 libxmu-dev \ - libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev + libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev \ + libavformat-dev ``` If you are on **Ubuntu 14.04** and encountered errors on installing these dependencies involving `libcheese`, see [#6158](https://github.com/servo/servo/issues/6158) for a workaround. @@ -56,7 +57,7 @@ sudo dnf install curl freeglut-devel libtool gcc-c++ libXi-devel \ freetype-devel mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel libXrandr-devel gperf \ fontconfig-devel cabextract ttmkfdir python python-virtualenv python-pip expat-devel \ rpm-build openssl-devel cmake bzip2-devel libXcursor-devel libXmu-devel mesa-libOSMesa-devel \ - dbus-devel + dbus-devel ffmpeg-devel ``` On Arch Linux: diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 0640fb17f60..96d81f76366 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -67,6 +67,7 @@ time = "0.1.12" url = {version = "1.0.0", features = ["heap_size", "query_encoding"]} util = {path = "../util"} uuid = {version = "0.2", features = ["v4"]} +video-metadata = {git = "https://github.com/GuillaumeGomez/video-metadata-rs"} websocket = "0.17" xml5ever = {version = "0.1.2", features = ["unstable"]} diff --git a/components/script/lib.rs b/components/script/lib.rs index 78a84f83586..0b0a45f701c 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -88,6 +88,7 @@ extern crate url; #[macro_use] extern crate util; extern crate uuid; +extern crate video_metadata; extern crate webrender_traits; extern crate websocket; extern crate xml5ever; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index b881a7c3ac4..44c4d9080a5 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1904,6 +1904,7 @@ dependencies = [ "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "video-metadata 0.1.2 (git+https://github.com/GuillaumeGomez/video-metadata-rs)", "webrender_traits 0.2.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2441,6 +2442,16 @@ dependencies = [ "serde 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "video-metadata" +version = "0.1.2" +source = "git+https://github.com/GuillaumeGomez/video-metadata-rs#c613de6a20c85ddda2db3b592ae595e8f993a699" +dependencies = [ + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "void" version = "1.0.2" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 61cbc98c96e..d63caa7e42c 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1758,6 +1758,7 @@ dependencies = [ "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "video-metadata 0.1.0 (git+https://github.com/GuillaumeGomez/video-metadata-rs)", "webrender_traits 0.2.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2303,6 +2304,16 @@ dependencies = [ "serde 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "video-metadata" +version = "0.1.0" +source = "git+https://github.com/GuillaumeGomez/video-metadata-rs#b5669bc88f33901ed4c45da74eedaadeabb162b1" +dependencies = [ + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "void" version = "1.0.2"