diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:50:39 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:51:10 +0000 |
| commit | 9c75148e6ebc88a0501e3d0242defb6dbdc3c23d (patch) | |
| tree | e24939addbed549191606f8b6927b29b42c18394 /libavformat/async.c | |
| parent | e3461197b1ffa0b4ebb80ee3d8567d3b286d7fc3 (diff) | |
| parent | 2758cdedfb7ac61f8b5e4861f99218b6fd43491d (diff) | |
Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'
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>
Diffstat (limited to 'libavformat/async.c')
| -rw-r--r-- | libavformat/async.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/async.c b/libavformat/async.c index 138ef137cf..a835292e05 100644 --- a/libavformat/async.c +++ b/libavformat/async.c @@ -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, |