Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'

* commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f':
  network: factor out bind-listening code
  use my full first name instead of short one in copyrights

Conflicts:
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/binkdata.h
index b9dc1f2,3da6b7e..57619be
--- 1/libavcodec/binkdata.h
--- 2/libavcodec/binkdata.h
+++ b/libavcodec/binkdata.h
@@@ -1,10 -1,10 +1,10 @@@
  /*
   * Bink video decoder
-  * Copyright (C) 2009 Kostya Shishkov
+  * Copyright (C) 2009 Konstantin Shishkov
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavcodec/binkdsp.c
index 2a9ef3d,a0ac2a8..a23f9c7
--- 1/libavcodec/binkdsp.c
--- 2/libavcodec/binkdsp.c
+++ b/libavcodec/binkdsp.c
@@@ -1,10 -1,10 +1,10 @@@
  /*
   * Bink DSP routines
-  * Copyright (c) 2009 Kostya Shishkov
+  * Copyright (c) 2009 Konstantin Shishkov
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavformat/network.c
Simple merge

diff --cc libavformat/network.h
Simple merge

diff --cc libavformat/rtmp.h
index 7c9bb6d,dc7ba5b..8fc8040
--- 1/libavformat/rtmp.h
--- 2/libavformat/rtmp.h
+++ b/libavformat/rtmp.h
@@@ -1,10 -1,10 +1,10 @@@
  /*
   * RTMP definitions
-  * Copyright (c) 2009 Kostya Shishkov
+  * Copyright (c) 2009 Konstantin Shishkov
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavformat/rtmppkt.c
index c2015a5,1fc1263..9800474
--- 1/libavformat/rtmppkt.c
--- 2/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@@ -1,10 -1,10 +1,10 @@@
  /*
   * RTMP input format
-  * Copyright (c) 2009 Kostya Shishkov
+  * Copyright (c) 2009 Konstantin Shishkov
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavformat/rtmppkt.h
index a942295,3f8660f..2740231
--- 1/libavformat/rtmppkt.h
--- 2/libavformat/rtmppkt.h
+++ b/libavformat/rtmppkt.h
@@@ -1,10 -1,10 +1,10 @@@
  /*
   * RTMP packet utilities
-  * Copyright (c) 2009 Kostya Shishkov
+  * Copyright (c) 2009 Konstantin Shishkov
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavformat/rtmpproto.c
index 5164931,58cedef..0c473e5
--- 1/libavformat/rtmpproto.c
--- 2/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@@ -1,10 -1,10 +1,10 @@@
  /*
   * RTMP network protocol
-  * Copyright (c) 2009 Kostya Shishkov
+  * Copyright (c) 2009 Konstantin Shishkov
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavformat/tcp.c
index 0d792e7,6e4de0d..d06c18a
--- 1/libavformat/tcp.c
--- 2/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@@ -108,39 -85,18 +108,18 @@@ static int tcp_open(URLContext *h, cons
      cur_ai = ai;
  
   restart:
-     ret = AVERROR(EIO);
      fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);
-     if (fd < 0)
+     if (fd < 0) {
+         ret = ff_neterrno();
          goto fail;
+     }
  
 -    if (listen_socket) {
 +    if (s->listen) {
-         int fd1;
-         int reuse = 1;
-         struct pollfd lp = { fd, POLLIN, 0 };
-         setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
-         ret = bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
-         if (ret) {
-             ret = ff_neterrno();
-             goto fail1;
-         }
-         ret = listen(fd, 1);
-         if (ret) {
-             ret = ff_neterrno();
-             goto fail1;
-         }
-         ret = poll(&lp, 1, s->listen_timeout >= 0 ? s->listen_timeout : -1);
-         if (ret <= 0) {
-             ret = AVERROR(ETIMEDOUT);
-             goto fail1;
-         }
-         fd1 = accept(fd, NULL, NULL);
-         if (fd1 < 0) {
-             ret = ff_neterrno();
+         if ((fd = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
 -                                 listen_timeout)) < 0) {
++                                 s->listen_timeout)) < 0) {
+             ret = fd;
              goto fail1;
          }
-         closesocket(fd);
-         fd = fd1;
-         ff_socket_nonblock(fd, 1);
      } else {
   redo:
          ff_socket_nonblock(fd, 1);