aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-08 02:03:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-08 02:03:14 +0100
commit0bd42ae72c0e88826b823d8106286d5abe2028e7 (patch)
treeda7087d1f67ea54580026e30dcedb4f58db6aba6 /libavformat/utils.c
parent5955c63c36e9b822f1186cd45a8dec5056b9c575 (diff)
parent1c8c41ff079953d332f61a9d26656e4e36af606c (diff)
downloadffmpeg-0bd42ae72c0e88826b823d8106286d5abe2028e7.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: avformat: Avoid a warning about mixed declarations and code BMV demuxer and decoder matroskaenc: Make sure the seekhead struct is freed even on seek failure mpeg12enc: Remove write-only variables. mpeg12enc: Don't set up run-level info for level 0. msmpeg4: Don't set up run-level info for level 0. avformat: Warn about using network functions without calling avformat_network_init avformat: Revise wording rdt: Set AVFMT_NOFILE on ff_rdt_demuxer rdt: Check the return value of avformat_open rtsp: Discard the dynamic handler, if it has an alloc function which failed dsputil: use cpuflags in x86 versions of vector_clip_int32() Conflicts: libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 35a6ab89a5..f32f2384ed 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4188,6 +4188,7 @@ int avformat_network_init(void)
{
#if CONFIG_NETWORK
int ret;
+ ff_network_inited_globally = 1;
if ((ret = ff_network_init()) < 0)
return ret;
ff_tls_init();