eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'

Browse Source 
This commit also disables the async fate test, because it
used internal APIs in a non-kosher way, which no longer
exists.

* commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d':
  lavf: reorganize URLProtocols

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-02-29 16:50:39 +00:00
parent e3461197b1 2758cdedfb
commit 9c75148e6e
39 changed files with 291 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/bluray.c
View File

@@ -224,7 +224,7 @@ static int64_t bluray_seek(URLContext *h, int64_t pos, int whence)
}
URLProtocol ff_bluray_protocol = {
const URLProtocol ff_bluray_protocol = {
.name = "bluray",
.url_close = bluray_close,
.url_open = bluray_open,