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)
* 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>
1  2 
ffserver.c
libavfilter/af_channelmap.c
libavformat/avio.c
libavformat/network.c
libavformat/udp.c

diff --cc ffserver.c
@@@ -1736,10 -1718,11 +1737,11 @@@ static int http_parse_request(HTTPConte
                      case REDIR_SDP:
                          {
                              uint8_t *sdp_data;
-                             int sdp_data_size, len;
+                             int sdp_data_size;
+                             socklen_t len;
                              struct sockaddr_in my_addr;
  
 -                            q += snprintf(q, c->buffer_size,
 +                            snprintf(q, c->buffer_size,
                                            "HTTP/1.0 200 OK\r\n"
                                            "Content-type: application/sdp\r\n"
                                            "\r\n");
Simple merge
Simple merge
  #include "network.h"
  #include "libavcodec/internal.h"
  #include "libavutil/mem.h"
 +#include "url.h"
 +#include "libavutil/time.h"
  
- #define THREADS (HAVE_PTHREADS || (defined(WIN32) && !defined(__MINGW32CE__)))
- #if THREADS
+ #if HAVE_THREADS
  #if HAVE_PTHREADS
  #include <pthread.h>
  #else
Simple merge