har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avio: make av_register_protocol2 internal.

Browse Source
This commit is contained in:
Anton Khirnov 2011-04-04 20:35:04 +02:00
parent 80c6e238b0
commit 8e76a19b63
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/allformats.c
View File

@ -21,6 +21,7 @@
#include "avformat.h" #include "avformat.h"
#include "rtp.h" #include "rtp.h"
#include "rdt.h" #include "rdt.h"
#include "url.h"
#define REGISTER_MUXER(X,x) { \ #define REGISTER_MUXER(X,x) { \
extern AVOutputFormat ff_##x##_muxer; \ extern AVOutputFormat ff_##x##_muxer; \
@ -34,7 +35,7 @@
#define REGISTER_PROTOCOL(X,x) { \ #define REGISTER_PROTOCOL(X,x) { \
extern URLProtocol ff_##x##_protocol; \ extern URLProtocol ff_##x##_protocol; \
if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&ff_##x##_protocol, sizeof(ff_##x##_protocol)); } if(CONFIG_##X##_PROTOCOL) ffurl_register_protocol(&ff_##x##_protocol, sizeof(ff_##x##_protocol)); }
void av_register_all(void) void av_register_all(void)
{ {

10
libavformat/avio.c
View File

@ -57,7 +57,7 @@ URLProtocol *av_protocol_next(URLProtocol *p)
else return first_protocol; else return first_protocol;
} }
int av_register_protocol2(URLProtocol *protocol, int size) int ffurl_register_protocol(URLProtocol *protocol, int size)
{ {
URLProtocol **p; URLProtocol **p;
if (size < sizeof(URLProtocol)) { if (size < sizeof(URLProtocol)) {
@ -86,12 +86,12 @@ struct URLProtocol_compat {
int av_register_protocol(URLProtocol *protocol) int av_register_protocol(URLProtocol *protocol)
{ {
return av_register_protocol2(protocol, sizeof(struct URLProtocol_compat)); return ffurl_register_protocol(protocol, sizeof(struct URLProtocol_compat));
} }
int register_protocol(URLProtocol *protocol) int register_protocol(URLProtocol *protocol)
{ {
return av_register_protocol2(protocol, sizeof(struct URLProtocol_compat)); return ffurl_register_protocol(protocol, sizeof(struct URLProtocol_compat));
} }
#endif #endif
@ -220,6 +220,10 @@ void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
{ {
avio_set_interrupt_cb(interrupt_cb); avio_set_interrupt_cb(interrupt_cb);
} }
int av_register_protocol2(URLProtocol *protocol, int size)
{
return ffurl_register_protocol(protocol, size);
}
#endif #endif
#define URL_SCHEME_CHARS \ #define URL_SCHEME_CHARS \

4
libavformat/avio.h
View File

@ -184,12 +184,14 @@ attribute_deprecated int register_protocol(URLProtocol *protocol);
attribute_deprecated int av_register_protocol(URLProtocol *protocol); attribute_deprecated int av_register_protocol(URLProtocol *protocol);
#endif #endif
#if FF_API_OLD_AVIO
/** /**
* Register the URLProtocol protocol. * Register the URLProtocol protocol.
* *
* @param size the size of the URLProtocol struct referenced * @param size the size of the URLProtocol struct referenced
*/ */
int av_register_protocol2(URLProtocol *protocol, int size); attribute_deprecated int av_register_protocol2(URLProtocol *protocol, int size);
#endif
#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */ #define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */

7
libavformat/url.h
View File

@ -131,4 +131,11 @@ int64_t ffurl_size(URLContext *h);
*/ */
int ffurl_get_file_handle(URLContext *h); int ffurl_get_file_handle(URLContext *h);
/**
* Register the URLProtocol protocol.
*
* @param size the size of the URLProtocol struct referenced
*/
int ffurl_register_protocol(URLProtocol *protocol, int size);
#endif //AVFORMAT_URL_H #endif //AVFORMAT_URL_H