Auto merge of #12863 - emilio:disable-media, r=larsbergstrom

script: Disable our dependency in ffmpeg until the media madness is over

<!-- Please describe your changes on the following line: -->

r? @larsbergstrom

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/12863)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-08-18 11:22:06 -05:00 committed by GitHub
commit fb7cb92076
14 changed files with 8 additions and 115 deletions

View file

@ -1,6 +0,0 @@
[error.html]
type: testharness
expected: TIMEOUT
[audio.error after successful load]
expected: TIMEOUT

View file

@ -7,6 +7,3 @@
[setting src attribute on autoplay video should trigger loadeddata event]
expected: NOTRUN
[setting src attribute on autoplay audio should trigger loadeddata event]
expected: NOTRUN

View file

@ -1,6 +0,0 @@
[event_loadeddata_noautoplay.html]
type: testharness
expected: TIMEOUT
[setting src attribute on non-autoplay audio should trigger loadeddata event]
expected: NOTRUN

View file

@ -1,6 +0,0 @@
[event_loadedmetadata.html]
type: testharness
expected: TIMEOUT
[setting src attribute on autoplay audio should trigger loadedmetadata event]
expected: NOTRUN

View file

@ -1,6 +0,0 @@
[event_loadedmetadata_noautoplay.html]
type: testharness
expected: TIMEOUT
[setting src attribute on non-autoplay audio should trigger loadedmetadata event]
expected: NOTRUN

View file

@ -1,6 +0,0 @@
[event_order_loadedmetadata_loadeddata.html]
type: testharness
expected: TIMEOUT
[setting src attribute on autoplay audio should trigger loadedmetadata then loadeddata event]
expected: NOTRUN

View file

@ -1,6 +0,0 @@
[readyState_during_loadeddata.html]
type: testharness
expected: TIMEOUT
[audio.readyState should be >= HAVE_CURRENT_DATA during loadeddata event]
expected: NOTRUN

View file

@ -1,6 +0,0 @@
[readyState_during_loadedmetadata.html]
type: testharness
expected: TIMEOUT
[audio.readyState should be >= HAVE_METADATA during loadedmetadata event]
expected: NOTRUN