Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26247 - servo:dependabot/cargo/servo-media-62cd58a, r=jdm

Browse source 
Bump servo-media from `03c7420` to `62cd58a`

Bumps [servo-media](https://github.com/servo/media) from `03c7420` to `62cd58a`.
<details>
<summary>Commits</summary>
<ul>
<li><a href="62cd58a94c"><code>62cd58a</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/servo/media/issues/335">#335</a> from khodzha/323</li>
<li><a href="9c76811761"><code>9c76811</code></a> removed doc comments on macro invocations</li>
<li><a href="cc9fb6211f"><code>cc9fb62</code></a> removed braces to avoid -D unused-braces failing build</li>
<li><a href="1a81e6e319"><code>1a81e6e</code></a> return err if ServoMedia wasnt initialized</li>
<li><a href="d7cce49d02"><code>d7cce49</code></a> Auto merge of <a href="https://github-redirect.dependabot.com/servo/media/issues/334">#334</a> - Darkspirit:https, r=jdm</li>
<li><a href="786b7bc78e"><code>786b7bc</code></a> Replace http with https</li>
<li>See full diff in <a href="03c7420794...62cd58a94c">compare view</a></li>
</ul>
</details>
<br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

**Note:** This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking `Bump now` in your [Dependabot dashboard](https://app.dependabot.com).

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

</details>
This commit is contained in:
bors-servo 2020-04-21 19:38:26 -04:00 • committed by GitHub
commit c88a972982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Cargo.lock generated
View file

@ -4920,7 +4920,7 @@ dependencies = [
[[package]]
name = "servo-media"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"servo-media-audio",
"servo-media-player",
@ -4932,7 +4932,7 @@ dependencies = [
[[package]]
name = "servo-media-audio"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"boxfnonce",
"byte-slice-cast",
@ -4951,7 +4951,7 @@ dependencies = [
[[package]]
name = "servo-media-dummy"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"boxfnonce",
"ipc-channel",
@ -4966,7 +4966,7 @@ dependencies = [
[[package]]
name = "servo-media-gstreamer"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"boxfnonce",
"byte-slice-cast",
@ -5002,7 +5002,7 @@ dependencies = [
[[package]]
name = "servo-media-gstreamer-render"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"gstreamer",
"gstreamer-video",
@ -5012,7 +5012,7 @@ dependencies = [
[[package]]
name = "servo-media-gstreamer-render-android"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"glib",
"gstreamer",
@ -5025,7 +5025,7 @@ dependencies = [
[[package]]
name = "servo-media-gstreamer-render-unix"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"glib",
"gstreamer",
@ -5038,7 +5038,7 @@ dependencies = [
[[package]]
name = "servo-media-player"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"ipc-channel",
"serde",
@ -5050,7 +5050,7 @@ dependencies = [
[[package]]
name = "servo-media-streams"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"lazy_static",
"uuid",
@ -5059,12 +5059,12 @@ dependencies = [
[[package]]
name = "servo-media-traits"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
[[package]]
name = "servo-media-webrtc"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"boxfnonce",
"log",
@ -5140,7 +5140,7 @@ dependencies = [
[[package]]
name = "servo_media_derive"
version = "0.1.0"
source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [
"proc-macro2 1.0.1",
"quote 1.0.2",