RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Warning fixes (approved by A'rpi). 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11413 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rathann 2003-11-08 00:26:51 +00:00
parent 304379ec71
commit e1dc488097
11 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gui/cfg.c
View File

@ -72,6 +72,7 @@ extern char * get_path( char * filename );
extern int flip; extern int flip;
extern int frame_dropping; extern int frame_dropping;
extern int stop_xscreensaver; extern int stop_xscreensaver;
extern int m_config_parse_config_file(m_config_t* config, char *conffile);
static m_config_t * gui_conf; static m_config_t * gui_conf;
static m_option_t gui_opts[] = static m_option_t gui_opts[] =

6
Gui/interface.c
View File

@ -1051,7 +1051,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
return NULL; return NULL;
case gtkSetExtraStereo: case gtkSetExtraStereo:
gtkAOExtraStereoMul=fparam; gtkAOExtraStereoMul=fparam;
audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)&gtkAOExtraStereoMul ); audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(void *)&gtkAOExtraStereoMul );
return NULL; return NULL;
case gtkSetPanscan: case gtkSetPanscan:
{ {
@ -1082,7 +1082,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
if ( eq ) if ( eq )
{ {
gtkEquChannels[eq->channel][eq->band]=eq->gain; gtkEquChannels[eq->channel][eq->band]=eq->gain;
audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)eq ); audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(void *)eq );
} }
else else
{ {
@ -1090,7 +1090,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
memset( gtkEquChannels,0,sizeof( gtkEquChannels ) ); memset( gtkEquChannels,0,sizeof( gtkEquChannels ) );
for ( i=0;i<6;i++ ) for ( i=0;i<6;i++ )
for ( j=0;j<10;j++ ) for ( j=0;j<10;j++ )
{ tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)&tmp ); } { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(void *)&tmp ); }
} }
return NULL; return NULL;
} }

6
libmpcodecs/pullup.c
View File

@ -1,6 +1,8 @@
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "pullup.h" #include "pullup.h"
#include "config.h" #include "config.h"
@ -321,7 +323,7 @@ static void check_field_queue(struct pullup_context *c)
} }
} }
int pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity) void pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity)
{ {
struct pullup_field *f; struct pullup_field *f;
@ -329,7 +331,7 @@ int pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int p
check_field_queue(c); check_field_queue(c);
/* Cannot have two fields of same parity in a row; drop the new one */ /* Cannot have two fields of same parity in a row; drop the new one */
if (c->last && c->last->parity == parity) return 0; if (c->last && c->last->parity == parity) return;
f = c->head; f = c->head;
f->parity = parity; f->parity = parity;

2
libmpcodecs/pullup.h
View File

@ -64,7 +64,7 @@ struct pullup_buffer *pullup_lock_buffer(struct pullup_buffer *b, int parity);
void pullup_release_buffer(struct pullup_buffer *b, int parity); void pullup_release_buffer(struct pullup_buffer *b, int parity);
struct pullup_buffer *pullup_get_buffer(struct pullup_context *c, int parity); struct pullup_buffer *pullup_get_buffer(struct pullup_context *c, int parity);
int pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity); void pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity);
void pullup_flush_fields(struct pullup_context *c); void pullup_flush_fields(struct pullup_context *c);
struct pullup_frame *pullup_get_frame(struct pullup_context *c); struct pullup_frame *pullup_get_frame(struct pullup_context *c);

4
libmpdemux/asf_mmst_streaming.c
View File

@ -118,7 +118,7 @@ static void string_utf16(char *dest, char *src, int len) {
size_t len1, len2; size_t len1, len2;
char *ip, *op; char *ip, *op;
if (url_conv != -1) if (url_conv != (iconv_t)(-1))
{ {
memset(dest, 0, 1000); memset(dest, 0, 1000);
len1 = len; len2 = 1000; len1 = len; len2 = 1000;
@ -588,7 +588,7 @@ int asf_mmst_streaming_start(stream_t *stream)
printf("mmst packet_length = %d\n",packet_length); printf("mmst packet_length = %d\n",packet_length);
#ifdef USE_ICONV #ifdef USE_ICONV
if (url_conv != -1) if (url_conv != (iconv_t)(-1))
iconv_close(url_conv); iconv_close(url_conv);
#endif #endif

1
libmpdemux/demux_ts.c
View File

@ -31,6 +31,7 @@
#include "stream.h" #include "stream.h"
#include "demuxer.h" #include "demuxer.h"
#include "parse_es.h"
#include "stheader.h" #include "stheader.h"
#include "bswap.h" #include "bswap.h"

2
libmpdemux/url.c
View File

@ -43,7 +43,7 @@ url_new(const char* url) {
if( ptr1==NULL ) { if( ptr1==NULL ) {
// Check for a special case: "sip:" (without "//"): // Check for a special case: "sip:" (without "//"):
if (strstr(url, "sip:") == url) { if (strstr(url, "sip:") == url) {
ptr1 = &url[3]; // points to ':' ptr1 = (char *)&url[3]; // points to ':'
jumpSize = 1; jumpSize = 1;
} else { } else {
mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n"); mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n");

1
libvo/vo_fbdev.c
View File

@ -13,6 +13,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <ctype.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>

2
libvo/vo_fbdev2.c
View File

@ -4,6 +4,7 @@
* (C) 2003 * (C) 2003
*/ */
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
@ -18,6 +19,7 @@
#include "video_out.h" #include "video_out.h"
#include "video_out_internal.h" #include "video_out_internal.h"
#include "fastmemcpy.h" #include "fastmemcpy.h"
#include "sub.h"
#include "mp_msg.h" #include "mp_msg.h"
static vo_info_t info = { static vo_info_t info = {

34
loader/qtx/qtxsdk/components.h
View File

@ -18,7 +18,7 @@ typedef signed short SInt16;
typedef unsigned long UInt32; typedef unsigned long UInt32;
typedef signed long SInt32; typedef signed long SInt32;
#define FOUR_CHAR_CODE(x) ((unsigned long)(x)) /* otherwise compiler will complain about values with high bit set */ #define FOUR_CHAR_CODE(a,b,c,d) ((unsigned long)(a)<<24 | (unsigned long)(b)<<16 | (unsigned long)(c)<<8 | (unsigned long)(d)) /* otherwise compiler will complain about values with high bit set */
// codec private shit: // codec private shit:
typedef void *GlobalsPtr; typedef void *GlobalsPtr;
@ -154,22 +154,22 @@ typedef ImageDescriptionPtr * ImageDescriptionHandle;
/* values for PixMap.pixelFormat*/ /* values for PixMap.pixelFormat*/
enum { enum {
k16LE555PixelFormat = FOUR_CHAR_CODE('L555'), /* 16 bit LE rgb 555 (PC)*/ k16LE555PixelFormat = FOUR_CHAR_CODE('L','5','5','5'), /* 16 bit LE rgb 555 (PC)*/
k16LE5551PixelFormat = FOUR_CHAR_CODE('5551'), /* 16 bit LE rgb 5551*/ k16LE5551PixelFormat = FOUR_CHAR_CODE('5','5','5','1'), /* 16 bit LE rgb 5551*/
k16BE565PixelFormat = FOUR_CHAR_CODE('B565'), /* 16 bit BE rgb 565*/ k16BE565PixelFormat = FOUR_CHAR_CODE('B','5','6','5'), /* 16 bit BE rgb 565*/
k16LE565PixelFormat = FOUR_CHAR_CODE('L565'), /* 16 bit LE rgb 565*/ k16LE565PixelFormat = FOUR_CHAR_CODE('L','5','6','5'), /* 16 bit LE rgb 565*/
k24BGRPixelFormat = FOUR_CHAR_CODE('24BG'), /* 24 bit bgr */ k24BGRPixelFormat = FOUR_CHAR_CODE('2','4','B','G'), /* 24 bit bgr */
k32BGRAPixelFormat = FOUR_CHAR_CODE('BGRA'), /* 32 bit bgra (Matrox)*/ k32BGRAPixelFormat = FOUR_CHAR_CODE('B','G','R','A'), /* 32 bit bgra (Matrox)*/
k32ABGRPixelFormat = FOUR_CHAR_CODE('ABGR'), /* 32 bit abgr */ k32ABGRPixelFormat = FOUR_CHAR_CODE('A','B','G','R'), /* 32 bit abgr */
k32RGBAPixelFormat = FOUR_CHAR_CODE('RGBA'), /* 32 bit rgba */ k32RGBAPixelFormat = FOUR_CHAR_CODE('R','G','B','A'), /* 32 bit rgba */
kYUVSPixelFormat = FOUR_CHAR_CODE('yuvs'), /* YUV 4:2:2 byte ordering 16-unsigned = 'YUY2'*/ kYUVSPixelFormat = FOUR_CHAR_CODE('y','u','v','s'), /* YUV 4:2:2 byte ordering 16-unsigned = 'YUY2'*/
kYUVUPixelFormat = FOUR_CHAR_CODE('yuvu'), /* YUV 4:2:2 byte ordering 16-signed*/ kYUVUPixelFormat = FOUR_CHAR_CODE('y','u','v','u'), /* YUV 4:2:2 byte ordering 16-signed*/
kYVU9PixelFormat = FOUR_CHAR_CODE('YVU9'), /* YVU9 Planar 9*/ kYVU9PixelFormat = FOUR_CHAR_CODE('Y','V','U','9'), /* YVU9 Planar 9*/
kYUV411PixelFormat = FOUR_CHAR_CODE('Y411'), /* YUV 4:1:1 Interleaved 16*/ kYUV411PixelFormat = FOUR_CHAR_CODE('Y','4','1','1'), /* YUV 4:1:1 Interleaved 16*/
kYVYU422PixelFormat = FOUR_CHAR_CODE('YVYU'), /* YVYU 4:2:2 byte ordering 16*/ kYVYU422PixelFormat = FOUR_CHAR_CODE('Y','V','Y','U'), /* YVYU 4:2:2 byte ordering 16*/
kUYVY422PixelFormat = FOUR_CHAR_CODE('UYVY'), /* UYVY 4:2:2 byte ordering 16*/ kUYVY422PixelFormat = FOUR_CHAR_CODE('U','Y','V','Y'), /* UYVY 4:2:2 byte ordering 16*/
kYUV211PixelFormat = FOUR_CHAR_CODE('Y211'), /* YUV 2:1:1 Packed 8*/ kYUV211PixelFormat = FOUR_CHAR_CODE('Y','2','1','1'), /* YUV 2:1:1 Packed 8*/
k2vuyPixelFormat = FOUR_CHAR_CODE('2vuy') /* UYVY 4:2:2 byte ordering 16*/ k2vuyPixelFormat = FOUR_CHAR_CODE('2','v','u','y') /* UYVY 4:2:2 byte ordering 16*/
}; };
struct __attribute__((__packed__)) PixMapExtension { struct __attribute__((__packed__)) PixMapExtension {

1
m_option.c
View File

@ -11,6 +11,7 @@
#include "m_option.h" #include "m_option.h"
//#include "m_config.h" //#include "m_config.h"
#include "mp_msg.h" #include "mp_msg.h"
#include "libmpdemux/url.h"
// Don't free for 'production' atm // Don't free for 'production' atm
#ifndef MP_DEBUG #ifndef MP_DEBUG