eden-emu/FFmpeg
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '2758cdedfb'

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 '2758cdedfb':
  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
commit 9c75148e6e
39 changed files with 291 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavformat/async.c
View file

@ -479,7 +479,7 @@ static const AVClass async_context_class = {
.version = LIBAVUTIL_VERSION_INT,
};
URLProtocol ff_async_protocol = {
const URLProtocol ff_async_protocol = {
.name = "async",
.url_open2 = async_open,
.url_read = async_read,
@ -489,7 +489,7 @@ URLProtocol ff_async_protocol = {
.priv_data_class = &async_context_class,
};
#ifdef TEST
#if 0
#define TEST_SEEK_POS (1536)
#define TEST_STREAM_SIZE (2048)
@ -581,7 +581,7 @@ static const AVClass async_test_context_class = {
.version = LIBAVUTIL_VERSION_INT,
};
URLProtocol ff_async_test_protocol = {
const URLProtocol ff_async_test_protocol = {
.name = "async-test",
.url_open2 = async_test_open,
.url_read = async_test_read,