diff options
author | Martin Storsjö <martin@martin.st> | 2010-06-22 13:58:48 +0000 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2010-06-22 13:58:48 +0000 |
commit | 9b07a2dc02e9b14e5b18485e7b16333a520b5dbb (patch) | |
tree | 7a6fad5f3125dddfb50a48d3ff976936c045f4b6 /libavformat | |
parent | e10412a334092bc2884674799318ff7fc60be785 (diff) | |
download | ffmpeg-9b07a2dc02e9b14e5b18485e7b16333a520b5dbb.tar.gz |
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.
Originally committed as revision 23702 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/allformats.c | 2 | ||||
-rw-r--r-- | libavformat/avformat.h | 2 | ||||
-rw-r--r-- | libavformat/avio.c | 23 | ||||
-rw-r--r-- | libavformat/avio.h | 9 |
4 files changed, 32 insertions, 4 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 2fd2b4cac3..94ab78c4e7 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -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) { diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 520750bdde..b2bac97818 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -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, \ diff --git a/libavformat/avio.c b/libavformat/avio.c index e79c8fcbfd..3371b40c4d 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -56,9 +56,14 @@ URLProtocol *av_protocol_next(URLProtocol *p) 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 @@ int av_register_protocol(URLProtocol *protocol) } #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); diff --git a/libavformat/avio.h b/libavformat/avio.h index 2b15e8d76b..7aefe1a1c4 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -252,12 +252,19 @@ URLProtocol *av_protocol_next(URLProtocol *p); * @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. |