5 files changed, 10 insertions, 0 deletions
diff --git a/avconv.c b/avconv.c
index 8f86c007bf..7c0e78a17f 100644
--- a/avconv.c
+++ b/avconv.c
@@ -542,6 +542,7 @@ void exit_program(int ret)
 #if CONFIG_AVFILTER
     avfilter_uninit();
 #endif
+    avformat_network_deinit();
 
     if (received_sigterm) {
         av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
@@ -4218,6 +4219,7 @@ int main(int argc, char **argv)
     avfilter_register_all();
 #endif
     av_register_all();
+    avformat_network_init();
 
     avio_set_interrupt_cb(decode_interrupt_cb);
 
diff --git a/avplay.c b/avplay.c
index 58db59639d..c67cc75fe8 100644
--- a/avplay.c
+++ b/avplay.c
@@ -1259,6 +1259,7 @@ static void do_exit(void)
 #if CONFIG_AVFILTER
     avfilter_uninit();
 #endif
+    avformat_network_deinit();
     if (show_status)
         printf("\n");
     SDL_Quit();
@@ -3066,6 +3067,7 @@ int main(int argc, char **argv)
     avfilter_register_all();
 #endif
     av_register_all();
+    avformat_network_init();
 
     init_opts();
 
diff --git a/avprobe.c b/avprobe.c
index 99ec1aa08e..992f07c5cf 100644
--- a/avprobe.c
+++ b/avprobe.c
@@ -399,6 +399,7 @@ int main(int argc, char **argv)
 
     parse_loglevel(argc, argv, options);
     av_register_all();
+    avformat_network_init();
     init_opts();
 #if CONFIG_AVDEVICE
     avdevice_register_all();
@@ -416,5 +417,7 @@ int main(int argc, char **argv)
 
     ret = probe_file(input_filename);
 
+    avformat_network_deinit();
+
     return ret;
 }
diff --git a/avserver.c b/avserver.c
index 5b9dcc90da..ec5f2bea6b 100644
--- a/avserver.c
+++ b/avserver.c
@@ -4670,6 +4670,7 @@ int main(int argc, char **argv)
 
     parse_loglevel(argc, argv, options);
     av_register_all();
+    avformat_network_init();
 
     show_banner();
 
diff --git a/ffmpeg.c b/ffmpeg.c
index 12d55174b8..c731cec53b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -493,6 +493,7 @@ void exit_program(int ret)
 #if CONFIG_AVFILTER
     avfilter_uninit();
 #endif
+    avformat_network_deinit();
 
     if (received_sigterm) {
         fprintf(stderr,
@@ -4367,6 +4368,7 @@ int main(int argc, char **argv)
     avfilter_register_all();
 #endif
     av_register_all();
+    avformat_network_init();
 
     avio_set_interrupt_cb(decode_interrupt_cb);