aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-22 15:50:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-03 02:21:55 +0100
commit7620d48f2eab67812d8c535d12a98eaa754a1177 (patch)
treefa54495c95ff5b4c0b6fa991124dc78e90732646 /libavformat/utils.c
parent9d7ae72725e16bc4b53ed6ccedf86d0ae2853809 (diff)
downloadffmpeg-7620d48f2eab67812d8c535d12a98eaa754a1177.tar.gz
avformat/network: Check for av_malloc* failures in ff_tls_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index bbb1cf766d..570603a725 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4095,7 +4095,8 @@ int avformat_network_init(void)
ff_network_inited_globally = 1;
if ((ret = ff_network_init()) < 0)
return ret;
- ff_tls_init();
+ if ((ret = ff_tls_init()) < 0)
+ return ret;
#endif
return 0;
}