• Michael Niedermayer's avatar
    Merge commit '4521645b' · 8943ad40
    Michael Niedermayer authored
    * commit '4521645b':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8943ad40
ffserver.c 156 KB