Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 08:30:35 +0000 (10:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 08:30:35 +0000 (10:30 +0200)
commit4d4f5911d3121133929da7b859755860f93684fd
tree25ca85b33909e89c0eb65b289158d14c79264af5
parent5711e4fd111a20afce15c90cb9b8d486f869a4e5
parent28306e6d620c109ddd672f7243adfbc2bbb3b18f
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>
libavcodec/binkdata.h
libavcodec/binkdsp.c
libavformat/network.c
libavformat/network.h
libavformat/rtmp.h
libavformat/rtmppkt.c
libavformat/rtmppkt.h
libavformat/rtmpproto.c
libavformat/tcp.c