mirror of
https://github.com/mpv-player/mpv
synced 2025-01-30 19:52:14 +00:00
compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9218 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
a5c6b4cefe
commit
ca0263659f
@ -11,6 +11,7 @@
|
||||
/* Design and implementation of different types of digital filters
|
||||
|
||||
*/
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include "dsp.h"
|
||||
|
||||
|
@ -228,7 +228,7 @@ static int play(){
|
||||
switch(pl_format.in&SIGN_MASK){
|
||||
case(US):
|
||||
for(i=0;i<len;i++)
|
||||
((int32_t*)in_data)[i]=(int32_t)(-(1<<31-1)+((uint32_t*)in_data)[i]);
|
||||
((int32_t*)in_data)[i]=(int32_t)(((uint32_t*)in_data)[i]-0x80000000);
|
||||
break;
|
||||
case(SI):
|
||||
for(i=0;i<len;i++)
|
||||
|
@ -14,3 +14,6 @@ extern int init_audio_filters(sh_audio_t *sh_audio,
|
||||
int in_samplerate, int in_channels, int in_format, int in_bps,
|
||||
int out_samplerate, int out_channels, int out_format, int out_bps,
|
||||
int out_minsize, int out_maxsize);
|
||||
extern int preinit_audio_filters(sh_audio_t *sh_audio,
|
||||
int in_samplerate, int in_channels, int in_format, int in_bps,
|
||||
int* out_samplerate, int* out_channels, int* out_format, int out_bps);
|
||||
|
@ -12,6 +12,10 @@
|
||||
#include "../mp_msg.h"
|
||||
#include "../bswap.h"
|
||||
|
||||
#ifdef USE_WIN32DLL
|
||||
#include "ldt_keeper.h"
|
||||
#endif
|
||||
|
||||
#ifdef USE_QTX_CODECS
|
||||
#include "../loader/qtx/qtxsdk/components.h"
|
||||
#include "wine/windef.h"
|
||||
|
@ -1,9 +1,10 @@
|
||||
/* This file (C) Mark Zealey <mark@zealos.org> 2002, released under GPL */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "geometry.h"
|
||||
#include "../mp_msg.h"
|
||||
#include "../mplayer.h" /* exit_player() */
|
||||
#include <string.h>
|
||||
|
||||
/* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */
|
||||
char *vo_geometry = NULL;
|
||||
|
@ -737,7 +737,7 @@ void vo_x11_setlayer( Display * mDisplay,Window vo_window,int layer )
|
||||
xev.data.l[0] = layer?ice_layer:orig_layer; // if not fullscreen, stay on default layer
|
||||
xev.data.l[1] = CurrentTime;
|
||||
mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Layered style stay on top ( layer %d ).\n",xev.data.l[0] );
|
||||
printf( "[x11] Layered style stay on top ( layer %d ).\n",xev.data.l[0] );
|
||||
printf( "[x11] Layered style stay on top ( layer %d ).\n",(int)xev.data.l[0] );
|
||||
XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, (XEvent *) &xev);
|
||||
break;
|
||||
}
|
||||
|
@ -1507,7 +1507,7 @@ inited_flags|=INITED_VO;
|
||||
|
||||
current_module="init_video_filters";
|
||||
|
||||
sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",video_out);
|
||||
sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",(char *)video_out);
|
||||
#ifdef HAVE_MENU
|
||||
if(use_menu) {
|
||||
vf_menu = vf_open_plugin(libmenu_vfs,sh_video->vfilter,"menu",menu_root);
|
||||
|
@ -246,7 +246,7 @@ subtitle *sub_read_line_subviewer(FILE *fd,subtitle *current) {
|
||||
|
||||
while (!current->text[0]) {
|
||||
if (!fgets (line, LINE_LEN, fd)) return NULL;
|
||||
if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,&i,&a4,&b1,&b2,&b3,&i,&b4)) < 10)
|
||||
if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
|
||||
continue;
|
||||
current->start = a1*360000+a2*6000+a3*100+a4/10;
|
||||
current->end = b1*360000+b2*6000+b3*100+b4/10;
|
||||
@ -864,7 +864,7 @@ int sub_autodetect (FILE *fd) {
|
||||
{sub_uses_time=0;return SUB_MICRODVD;}
|
||||
if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8)
|
||||
{sub_uses_time=1;return SUB_SUBRIP;}
|
||||
if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i, &i, &i)==10)
|
||||
if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10)
|
||||
{sub_uses_time=1;return SUB_SUBVIEWER;}
|
||||
if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i))
|
||||
{sub_uses_time=1;return SUB_SUBVIEWER2;}
|
||||
|
Loading…
Reference in New Issue
Block a user