virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat: Warn about using network functions without calling avformat_network_init

Browse Source 
This is to make developers aware of the fact that they will
start using the new init function at some point.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2011-11-07 13:57:33 +02:00
parent 87892ef8a6
commit ce145690b6
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/network.c
View File

@@ -119,8 +119,15 @@ void ff_tls_deinit(void)
avpriv_unlock_avformat(); avpriv_unlock_avformat();
} }
int ff_network_inited_globally;
int ff_network_init(void) int ff_network_init(void)
{ {
if (!ff_network_inited_globally)
av_log(NULL, AV_LOG_WARNING, "Using network protocols without global "
"network initialization. Please use "
"avformat_network_init(), this will "
"become mandatory later.\n");
#if HAVE_WINSOCK2_H #if HAVE_WINSOCK2_H
WSADATA wsaData; WSADATA wsaData;
if (WSAStartup(MAKEWORD(1,1), &wsaData)) if (WSAStartup(MAKEWORD(1,1), &wsaData))

1
libavformat/network.h
View File

@@ -56,6 +56,7 @@ int ff_neterrno(void);
int ff_socket_nonblock(int socket, int enable); int ff_socket_nonblock(int socket, int enable);
extern int ff_network_inited_globally;
int ff_network_init(void); int ff_network_init(void);
void ff_network_close(void); void ff_network_close(void);

1
libavformat/utils.c
View File

@@ -3967,6 +3967,7 @@ int avformat_query_codec(AVOutputFormat *ofmt, enum CodecID codec_id, int std_co
int avformat_network_init(void) int avformat_network_init(void)
{ {
#if CONFIG_NETWORK #if CONFIG_NETWORK
ff_network_inited_globally = 1;
int ret; int ret;
if ((ret = ff_network_init()) < 0) if ((ret = ff_network_init()) < 0)
return ret; return ret;