From e16942852979c44faaa8fcd6ad95d1ff3642368b Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 26 May 2011 13:37:13 +0200 Subject: Mark parameterless function declarations as 'void'. --- libavformat/network.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/network.h b/libavformat/network.h index 881384c..db8466c 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -33,7 +33,8 @@ #define ECONNREFUSED WSAECONNREFUSED #define EINPROGRESS WSAEINPROGRESS -static inline int ff_neterrno() { +static inline int ff_neterrno(void) +{ int err = WSAGetLastError(); switch (err) { case WSAEWOULDBLOCK: -- cgit v1.1 From 9749cdf7754e600ff50dc255519fdb7bb5aad800 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 26 May 2011 06:59:08 +0200 Subject: lavf: initialize demuxer private options. --- libavformat/utils.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavformat') diff --git a/libavformat/utils.c b/libavformat/utils.c index 89ab108..b844ab9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -424,6 +424,10 @@ int av_open_input_stream(AVFormatContext **ic_ptr, err = AVERROR(ENOMEM); goto fail; } + if (fmt->priv_class) { + *(const AVClass**)ic->priv_data = fmt->priv_class; + av_opt_set_defaults(ic->priv_data); + } } else { ic->priv_data = NULL; } -- cgit v1.1