RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add priv_data_size and priv_data_class to URLProtocol 

This allows url_alloc to allocate and initialize the priv_data.

Originally committed as revision 23706 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-06-22 14:09:08 +00:00
parent 4636f11551
commit 735cf6b265
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

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

9
libavformat/avio.c
View File

@ -118,6 +118,13 @@ static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up,
uc->flags = flags;
uc->is_streamed = 0; /* default = not streamed */
uc->max_packet_size = 0; /* default: stream file */
if (up->priv_data_size) {
uc->priv_data = av_mallocz(up->priv_data_size);
if (up->priv_data_class) {
*(AVClass**)uc->priv_data = up->priv_data_class;
av_opt_set_defaults(uc->priv_data);
}
}
*puc = uc;
return 0;
@ -272,6 +279,8 @@ int url_close(URLContext *h)
#if CONFIG_NETWORK
ff_network_close();
#endif
if (h->prot->priv_data_size)
av_free(h->priv_data);
av_free(h);
return ret;
}

2
libavformat/avio.h
View File

@ -251,6 +251,8 @@ typedef struct URLProtocol {
int64_t (*url_read_seek)(URLContext *h, int stream_index,
int64_t timestamp, int flags);
int (*url_get_file_handle)(URLContext *h);
int priv_data_size;
const AVClass *priv_data_class;
} URLProtocol;
#if LIBAVFORMAT_VERSION_MAJOR < 53