avformat: Avoid a warning about mixed declarations and code

Message ID 1320700117-88353-1-git-send-email-martin@martin.st
State Committed
Commit 1c8c41ff079953d332f61a9d26656e4e36af606c
Headers show

Commit Message

Martin Storsjö Nov. 7, 2011, 9:08 p.m.
---
Sorry for not noticing this one earlier...

 libavformat/utils.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Janne Grunau Nov. 7, 2011, 11 p.m. | #1
On Mon, Nov 07, 2011 at 11:08:37PM +0200, Martin Storsjö wrote:
> ---
> Sorry for not noticing this one earlier...
> 
>  libavformat/utils.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/libavformat/utils.c b/libavformat/utils.c
> index cb472c9..309fb97 100644
> --- a/libavformat/utils.c
> +++ b/libavformat/utils.c
> @@ -3967,8 +3967,8 @@ int avformat_query_codec(AVOutputFormat *ofmt, enum CodecID codec_id, int std_co
>  int avformat_network_init(void)
>  {
>  #if CONFIG_NETWORK
> -    ff_network_inited_globally = 1;
>      int ret;
> +    ff_network_inited_globally = 1;
>      if ((ret = ff_network_init()) < 0)
>          return ret;
>      ff_tls_init();
> -- 

ok

Janne

Patch

diff --git a/libavformat/utils.c b/libavformat/utils.c
index cb472c9..309fb97 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3967,8 +3967,8 @@  int avformat_query_codec(AVOutputFormat *ofmt, enum CodecID codec_id, int std_co
 int avformat_network_init(void)
 {
 #if CONFIG_NETWORK
-    ff_network_inited_globally = 1;
     int ret;
+    ff_network_inited_globally = 1;
     if ((ret = ff_network_init()) < 0)
         return ret;
     ff_tls_init();