Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Oct 2012 12:19:11 +0000 (13:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Oct 2012 12:19:11 +0000 (13:19 +0100)
commit8943ad40146d322f5a5bf2bab790d117ec7a4c37
tree3aa57b91ebe60e9958219e944db3d675e6972ba7
parentf9f79cb0ecb68546e6de3db6072f631bb3fbcff8
parent4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26
Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'

* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
  avio: fix pointer type mismatches in avio_enum_protocols()
  avserver: use socklen_t where appropriate
  udp: use socklen_t where appropriate
  network: use HAVE_THREADS instead of local hack
  af_channelmap: remove stray enum declaration
  buffersink: remove stray semicolon after function definition

Conflicts:
libavformat/avio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffserver.c
libavfilter/af_channelmap.c
libavformat/avio.c
libavformat/network.c
libavformat/udp.c