avformat: Warn about using network functions without calling avformat_network_init
authorMartin Storsjö <martin@martin.st>
Mon, 7 Nov 2011 11:57:33 +0000 (13:57 +0200)
committerMartin Storsjö <martin@martin.st>
Mon, 7 Nov 2011 17:29:33 +0000 (19:29 +0200)
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>
libavformat/network.c
libavformat/network.h
libavformat/utils.c

index d84dcaf..f8403ae 100644 (file)
@@ -119,8 +119,15 @@ void ff_tls_deinit(void)
     avpriv_unlock_avformat();
 }
 
+int ff_network_inited_globally;
+
 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
     WSADATA wsaData;
     if (WSAStartup(MAKEWORD(1,1), &wsaData))
index df79f45..72d01d2 100644 (file)
@@ -56,6 +56,7 @@ int ff_neterrno(void);
 
 int ff_socket_nonblock(int socket, int enable);
 
+extern int ff_network_inited_globally;
 int ff_network_init(void);
 void ff_network_close(void);
 
index 8d0ae05..cb472c9 100644 (file)
@@ -3967,6 +3967,7 @@ int avformat_query_codec(AVOutputFormat *ofmt, enum CodecID codec_id, int std_co
 int avformat_network_init(void)
 {
 #if CONFIG_NETWORK
+    ff_network_inited_globally = 1;
     int ret;
     if ((ret = ff_network_init()) < 0)
         return ret;