Mercurial > libavformat.hg
changeset 6159:3fcaee5cf416 libavformat
Add an av_register_protocol2 function that takes a size parameter
This allows extending the URLProtocol struct without breaking binary
compatibility with code compiled with older definitions of the struct.
| author | mstorsjo |
|---|---|
| date | Tue, 22 Jun 2010 13:58:48 +0000 |
| parents | 4d1d3e0ba6d7 |
| children | 1b4be334ef89 |
| files | allformats.c avformat.h avio.c avio.h |
| diffstat | 4 files changed, 32 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/allformats.c Tue Jun 22 08:48:28 2010 +0000 +++ b/allformats.c Tue Jun 22 13:58:48 2010 +0000 @@ -34,7 +34,7 @@ #define REGISTER_PROTOCOL(X,x) { \ 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) {
--- a/avformat.h Tue Jun 22 08:48:28 2010 +0000 +++ b/avformat.h Tue Jun 22 13:58:48 2010 +0000 @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 68 +#define LIBAVFORMAT_VERSION_MINOR 69 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
--- a/avio.c Tue Jun 22 08:48:28 2010 +0000 +++ b/avio.c Tue Jun 22 13:58:48 2010 +0000 @@ -56,9 +56,14 @@ else return first_protocol; } -int av_register_protocol(URLProtocol *protocol) +int av_register_protocol2(URLProtocol *protocol, int size) { 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; *p = protocol; @@ -67,6 +72,22 @@ } #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) { return av_register_protocol(protocol);
--- a/avio.h Tue Jun 22 08:48:28 2010 +0000 +++ b/avio.h Tue Jun 22 13:58:48 2010 +0000 @@ -252,12 +252,19 @@ * @deprecated Use av_register_protocol() instead. */ attribute_deprecated int register_protocol(URLProtocol *protocol); + +/** + * @deprecated Use av_register_protocol2() instead. + */ +attribute_deprecated int av_register_protocol(URLProtocol *protocol); #endif /** * 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.