RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-05-01 15:48:03 +00:00
Code Issues Projects Releases Wiki Activity

Add an av_register_protocol2 function that takes a size parameter

Browse Source 
This allows extending the URLProtocol struct without breaking binary
compatibility with code compiled with older definitions of the struct.

Originally committed as revision 23702 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-06-22 13:58:48 +00:00
parent e10412a334
commit 9b07a2dc02
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/allformats.c
View File

@ -34,7 +34,7 @@
#define REGISTER_PROTOCOL(X,x) { \ #define REGISTER_PROTOCOL(X,x) { \
extern URLProtocol x##_protocol; \ extern URLProtocol x##_protocol; \
if(CONFIG_##X##_PROTOCOL) av_register_protocol(&x##_protocol); } if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&x##_protocol, sizeof(x##_protocol)); }
void av_register_all(void) void av_register_all(void)
{ {

2
libavformat/avformat.h
View File

@ -22,7 +22,7 @@
#define AVFORMAT_AVFORMAT_H #define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 68 #define LIBAVFORMAT_VERSION_MINOR 69
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

23
libavformat/avio.c
View File

@ -56,9 +56,14 @@ URLProtocol *av_protocol_next(URLProtocol *p)
else return first_protocol; else return first_protocol;
} }
int av_register_protocol(URLProtocol *protocol) int av_register_protocol2(URLProtocol *protocol, int size)
{ {
URLProtocol **p; URLProtocol **p;
if (size < sizeof(URLProtocol)) {
URLProtocol* temp = av_mallocz(sizeof(URLProtocol));
memcpy(temp, protocol, size);
protocol = temp;
}
p = &first_protocol; p = &first_protocol;
while (*p != NULL) p = &(*p)->next; while (*p != NULL) p = &(*p)->next;
*p = protocol; *p = protocol;
@ -67,6 +72,22 @@ int av_register_protocol(URLProtocol *protocol)
} }
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if LIBAVFORMAT_VERSION_MAJOR < 53
/* The layout of URLProtocol as of when major was bumped to 52 */
struct URLProtocol_compat {
const char *name;
int (*url_open)(URLContext *h, const char *filename, int flags);
int (*url_read)(URLContext *h, unsigned char *buf, int size);
int (*url_write)(URLContext *h, unsigned char *buf, int size);
int64_t (*url_seek)(URLContext *h, int64_t pos, int whence);
int (*url_close)(URLContext *h);
struct URLProtocol *next;
};
int av_register_protocol(URLProtocol *protocol)
{
return av_register_protocol2(protocol, sizeof(struct URLProtocol_compat));
}
int register_protocol(URLProtocol *protocol) int register_protocol(URLProtocol *protocol)
{ {
return av_register_protocol(protocol); return av_register_protocol(protocol);

9
libavformat/avio.h
View File

@ -252,12 +252,19 @@ URLProtocol *av_protocol_next(URLProtocol *p);
* @deprecated Use av_register_protocol() instead. * @deprecated Use av_register_protocol() instead.
*/ */
attribute_deprecated int register_protocol(URLProtocol *protocol); attribute_deprecated int register_protocol(URLProtocol *protocol);
/**
* @deprecated Use av_register_protocol2() instead.
*/
attribute_deprecated int av_register_protocol(URLProtocol *protocol);
#endif #endif
/** /**
* Registers the URLProtocol protocol. * Registers the URLProtocol protocol.
*
* @param size the size of the URLProtocol struct referenced
*/ */
int av_register_protocol(URLProtocol *protocol); int av_register_protocol2(URLProtocol *protocol, int size);
/** /**
* Bytestream IO Context. * Bytestream IO Context.