xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-10-28 13:19:11 +01:00
commit 8943ad4014
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffserver.c
View File

@ -812,7 +812,8 @@ static void http_send_too_busy_reply(int fd)
static void new_connection(int server_fd, int is_rtsp)
{
struct sockaddr_in from_addr;
int fd, len;
socklen_t len;
int fd;
HTTPContext *c = NULL;
len = sizeof(from_addr);
@ -1736,7 +1737,8 @@ static int http_parse_request(HTTPContext *c)
case REDIR_SDP:
{
uint8_t *sdp_data;
int sdp_data_size, len;
int sdp_data_size;
socklen_t len;
struct sockaddr_in my_addr;
snprintf(q, c->buffer_size,
@ -3019,7 +3021,8 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url)
char path1[1024];
const char *path;
uint8_t *content;
int content_length, len;
int content_length;
socklen_t len;
struct sockaddr_in my_addr;
/* find which url is asked */

1
libavfilter/af_channelmap.c
View File

@ -125,7 +125,6 @@ static av_cold int channelmap_init(AVFilterContext *ctx, const char *args)
ChannelMapContext *s = ctx->priv;
int ret;
char *mapping;
enum mode;
int map_entries = 0;
char buf[256];
enum MappingMode mode;

10
libavformat/avio.c
View File

@ -85,11 +85,11 @@ const AVClass ffurl_context_class = {
const char *avio_enum_protocols(void **opaque, int output)
{
URLProtocol **p = (URLProtocol **)opaque;
*p = ffurl_protocol_next(*p);
if (!*p) return NULL;
if ((output && (*p)->url_write) || (!output && (*p)->url_read))
return (*p)->name;
URLProtocol *p;
*opaque = ffurl_protocol_next(*opaque);
if (!(p = *opaque)) return NULL;
if ((output && p->url_write) || (!output && p->url_read))
return p->name;
return avio_enum_protocols(opaque, output);
}

14
libavformat/network.c
View File

@ -25,9 +25,7 @@
#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
@ -38,7 +36,7 @@
#if CONFIG_OPENSSL
#include <openssl/ssl.h>
static int openssl_init;
#if THREADS
#if HAVE_THREADS
#include <openssl/crypto.h>
#include "libavutil/avutil.h"
pthread_mutex_t *openssl_mutexes;
@ -59,7 +57,7 @@ static unsigned long openssl_thread_id(void)
#endif
#if CONFIG_GNUTLS
#include <gnutls/gnutls.h>
#if THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
#if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
#include <gcrypt.h>
#include <errno.h>
#undef malloc
@ -75,7 +73,7 @@ void ff_tls_init(void)
if (!openssl_init) {
SSL_library_init();
SSL_load_error_strings();
#if THREADS
#if HAVE_THREADS
if (!CRYPTO_get_locking_callback()) {
int i;
openssl_mutexes = av_malloc(sizeof(pthread_mutex_t) * CRYPTO_num_locks());
@ -91,7 +89,7 @@ void ff_tls_init(void)
openssl_init++;
#endif
#if CONFIG_GNUTLS
#if THREADS && GNUTLS_VERSION_NUMBER < 0x020b00
#if HAVE_THREADS && GNUTLS_VERSION_NUMBER < 0x020b00
if (gcry_control(GCRYCTL_ANY_INITIALIZATION_P) == 0)
gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#endif
@ -106,7 +104,7 @@ void ff_tls_deinit(void)
#if CONFIG_OPENSSL
openssl_init--;
if (!openssl_init) {
#if THREADS
#if HAVE_THREADS
if (CRYPTO_get_locking_callback() == openssl_lock) {
int i;
CRYPTO_set_locking_callback(NULL);

4
libavformat/udp.c
View File

@ -312,7 +312,7 @@ static int udp_set_url(struct sockaddr_storage *addr,
}
static int udp_socket_create(UDPContext *s, struct sockaddr_storage *addr,
int *addr_len, const char *localaddr)
socklen_t *addr_len, const char *localaddr)
{
int udp_fd = -1;
struct addrinfo *res0 = NULL, *res = NULL;
@ -500,7 +500,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
const char *p;
char buf[256];
struct sockaddr_storage my_addr;
int len;
socklen_t len;
int reuse_specified = 0;
int i, include = 0, num_sources = 0;
char *sources[32];