mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-27 05:00:37 +00:00
Call avformat_network_init/deinit in the programs
Calling the init function will become mandatory at some later point. By calling it, more heavy network init (such as SSL/TLS library init) can be done once at startup, instead of implicitly when used (which could lead to it being done a number of times). Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
3607ed70d5
commit
776f2bb91a
2
avconv.c
2
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);
|
||||
|
||||
|
2
avplay.c
2
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();
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -4670,6 +4670,7 @@ int main(int argc, char **argv)
|
||||
|
||||
parse_loglevel(argc, argv, options);
|
||||
av_register_all();
|
||||
avformat_network_init();
|
||||
|
||||
show_banner();
|
||||
|
||||
|
2
ffmpeg.c
2
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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user