virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  lavf: Remove a now useless parameter to ffurl_register_protocol

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-10-30 17:48:43 +01:00
parent 94a80e36d3 0c5f839693
commit 7f019129e1
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/allformats.c
View File

@@ -45,8 +45,7 @@
{ \
extern URLProtocol ff_##x##_protocol; \
if (CONFIG_##X##_PROTOCOL) \
ffurl_register_protocol(&ff_##x##_protocol, \
sizeof(ff_##x##_protocol)); \
ffurl_register_protocol(&ff_##x##_protocol); \
}
void av_register_all(void)

7
libavformat/avio.c
View File

@@ -94,14 +94,9 @@ const char *avio_enum_protocols(void **opaque, int output)
return avio_enum_protocols(opaque, output);
}
int ffurl_register_protocol(URLProtocol *protocol, int size)
int ffurl_register_protocol(URLProtocol *protocol)
{
URLProtocol **p;
if (size < sizeof(URLProtocol)) {
URLProtocol *temp = av_mallocz(sizeof(URLProtocol));
memcpy(temp, protocol, size);
protocol = temp;
}
p = &first_protocol;
while (*p != NULL)
p = &(*p)->next;

4
libavformat/url.h
View File

@@ -226,10 +226,8 @@ int ffurl_shutdown(URLContext *h, int flags);
/**
* Register the URLProtocol protocol.
*
* @param size the size of the URLProtocol struct referenced
*/
int ffurl_register_protocol(URLProtocol *protocol, int size);
int ffurl_register_protocol(URLProtocol *protocol);
/**
* Check if the user has requested to interrup a blocking function