diff options
| -rw-r--r-- | divx4_vbr.c | 8 | ||||
| -rw-r--r-- | input/input.c | 2 | ||||
| -rw-r--r-- | liba52/imdct.c | 17 | ||||
| -rw-r--r-- | liba52/imdct_3dnow.h | 5 | ||||
| -rw-r--r-- | libmpcodecs/Makefile | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_huffyuv.c | 2 | ||||
| -rw-r--r-- | libmpdemux/audio_in.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_asf.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_avi.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_mov.c | 6 | ||||
| -rw-r--r-- | libmpdemux/demux_mpg.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_pva.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_real.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_viv.c | 2 | ||||
| -rw-r--r-- | libmpdemux/tv.c | 1 | ||||
| -rw-r--r-- | libmpdemux/tvi_v4l.c | 2 | ||||
| -rw-r--r-- | libmpdvdkit2/nav_read.c | 2 | ||||
| -rw-r--r-- | libvo/geometry.c | 2 | ||||
| -rw-r--r-- | libvo/vo_gl2.c | 2 | ||||
| -rw-r--r-- | libvo/vo_xvidix.c | 1 | ||||
| -rw-r--r-- | libvo/vosub_vidix.c | 2 | ||||
| -rw-r--r-- | mplayer.c | 2 | ||||
| -rw-r--r-- | postproc/postprocess_template.c | 5 | ||||
| -rw-r--r-- | postproc/swscale_template.c | 2 |
24 files changed, 50 insertions, 33 deletions
diff --git a/divx4_vbr.c b/divx4_vbr.c index 3a6dafcf69..f1a87c4906 100644 --- a/divx4_vbr.c +++ b/divx4_vbr.c @@ -62,7 +62,7 @@ typedef struct entry_s static int m_iCount; static int m_iQuant; -static int m_iCrispness; +/*static int m_iCrispness;*/ static short m_bDrop; static float m_fQuant; @@ -178,7 +178,7 @@ int VbrControl_init_2pass_vbr_encoding(const char *filename, int bitrate, double while(!feof(m_pFile)) - { fscanf(m_pFile, "Frame %d: intra %d, quant %d, texture %d, motion %d, total %d\n", + { fscanf(m_pFile, "Frame %d: intra %hd, quant %d, texture %d, motion %d, total %d\n", &iNumFrames, &(vFrame.is_key_frame), &(vFrame.quant), &(vFrame.text_bits), &(vFrame.motion_bits), &(vFrame.total_bits)); vFrame.total_bits+=vFrame.text_bits*(qual_multiplier-1); @@ -208,7 +208,7 @@ int VbrControl_init_2pass_vbr_encoding(const char *filename, int bitrate, double fseek(m_pFile, lFrameStart, SEEK_SET); // start again for (i=0;i<iNumFrames;i++) - { fscanf(m_pFile, "Frame %d: intra %d, quant %d, texture %d, motion %d, total %d\n", + { fscanf(m_pFile, "Frame %d: intra %hd, quant %d, texture %d, motion %d, total %d\n", &dummy, &(m_vFrames[i].is_key_frame), &(m_vFrames[i].quant), &(m_vFrames[i].text_bits), &(m_vFrames[i].motion_bits), &(m_vFrames[i].total_bits)); @@ -227,7 +227,7 @@ int VbrControl_init_2pass_vbr_encoding(const char *filename, int bitrate, double if(desired_bits<=non_text_bits) { - char s[200]; +/* char s[200];*/ printf("Specified bitrate is too low for this clip.\n" "Minimum possible bitrate for the clip is %.0f kbps. Overriding\n" "user-specified value.\n", diff --git a/input/input.c b/input/input.c index 8e54686162..e68f9632f8 100644 --- a/input/input.c +++ b/input/input.c @@ -689,7 +689,7 @@ mp_input_default_cmd_func(int fd,char* buf, int l) { void mp_input_add_cmd_filter(mp_input_cmd_filter func, void* ctx) { - mp_cmd_filter_t* filter = malloc(sizeof(mp_cmd_filter_t)), *prev; + mp_cmd_filter_t* filter = malloc(sizeof(mp_cmd_filter_t))/*, *prev*/; filter->filter = func; filter->ctx = ctx; diff --git a/liba52/imdct.c b/liba52/imdct.c index 61a337fec4..8af80c5a21 100644 --- a/liba52/imdct.c +++ b/liba52/imdct.c @@ -193,16 +193,19 @@ static inline complex_t cmplx_mult(complex_t a, complex_t b) void imdct_do_512(sample_t data[],sample_t delay[], sample_t bias) { - int i,k; + int i; +#ifndef USE_AC3_C + int k; int p,q; int m; int two_m; int two_m_plus_one; - sample_t tmp_a_i; - sample_t tmp_a_r; sample_t tmp_b_i; sample_t tmp_b_r; +#endif + sample_t tmp_a_i; + sample_t tmp_a_r; sample_t *data_ptr; sample_t *delay_ptr; @@ -401,16 +404,16 @@ const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8))) = { 0.707106781188, 0 void imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias) { - int i,k; - int p,q; +/* int i,k; + int p,q;*/ int m; int two_m; int two_m_plus_one; - sample_t tmp_a_i; +/* sample_t tmp_a_i; sample_t tmp_a_r; sample_t tmp_b_i; - sample_t tmp_b_r; + sample_t tmp_b_r;*/ sample_t *data_ptr; sample_t *delay_ptr; diff --git a/liba52/imdct_3dnow.h b/liba52/imdct_3dnow.h index cbde91d4f3..b45878913b 100644 --- a/liba52/imdct_3dnow.h +++ b/liba52/imdct_3dnow.h @@ -322,7 +322,8 @@ imdct_do_512_3dnow #endif (sample_t data[],sample_t delay[], sample_t bias) { - int i,k; + int i; +/* int k; int p,q; int m; int two_m; @@ -331,7 +332,7 @@ imdct_do_512_3dnow sample_t tmp_a_i; sample_t tmp_a_r; sample_t tmp_b_i; - sample_t tmp_b_r; + sample_t tmp_b_r;*/ sample_t *data_ptr; sample_t *delay_ptr; diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 32783abe65..556b23b4ed 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -37,7 +37,7 @@ OBJS=$(SRCS:.c=.o) SRCS2=$(ENCODER_SRCS) OBJS2=$(SRCS2:.c=.o) -CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) +CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) -D_GNU_SOURCE .SUFFIXES: .c .o diff --git a/libmpcodecs/vd_huffyuv.c b/libmpcodecs/vd_huffyuv.c index fec66808df..2f8d0e7b61 100644 --- a/libmpcodecs/vd_huffyuv.c +++ b/libmpcodecs/vd_huffyuv.c @@ -595,7 +595,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) { mp_image_t* mpi; int pixel_ptr; - unsigned char y1, y2, u, v, r, g, b, a; + unsigned char y1, y2, u, v, r, g, b/*, a*/; unsigned char left_y, left_u, left_v, left_r, left_g, left_b; unsigned char tmp, mi, mx, med; unsigned char *swap; diff --git a/libmpdemux/audio_in.c b/libmpdemux/audio_in.c index dbc8752be5..54ba446dfc 100644 --- a/libmpdemux/audio_in.c +++ b/libmpdemux/audio_in.c @@ -109,7 +109,9 @@ int audio_in_set_channels(audio_in_t *ai, int channels) int audio_in_set_device(audio_in_t *ai, char *device) { +#ifdef HAVE_ALSA9 int i; +#endif if (ai->setup) return -1; switch (ai->type) { #ifdef HAVE_ALSA9 diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 9d6196dab5..ab860d2e13 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -397,11 +397,11 @@ void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags){ } int demux_asf_control(demuxer_t *demuxer,int cmd, void *arg){ - demux_stream_t *d_audio=demuxer->audio; +/* demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; sh_audio_t *sh_audio=d_audio->sh; sh_video_t *sh_video=d_video->sh; - +*/ switch(cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: *((unsigned long *)arg)=(unsigned long)(asf_movielength); diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 8406e8f794..8b312a71bf 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -788,9 +788,9 @@ void demux_close_avi(demuxer_t *demuxer) { int demux_avi_control(demuxer_t *demuxer,int cmd, void *arg){ avi_priv_t *priv=demuxer->priv; - demux_stream_t *d_audio=demuxer->audio; +/* demux_stream_t *d_audio=demuxer->audio;*/ demux_stream_t *d_video=demuxer->video; - sh_audio_t *sh_audio=d_audio->sh; +/* sh_audio_t *sh_audio=d_audio->sh;*/ sh_video_t *sh_video=d_video->sh; diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index e8e315061b..03b8ef6408 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -527,7 +527,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak break; } case MOV_FOURCC('s','t','t','s'): { - int temp=stream_read_dword(demuxer->stream); + stream_read_dword(demuxer->stream); int len=stream_read_dword(demuxer->stream); int i; unsigned int pts=0; @@ -582,7 +582,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak break; } case MOV_FOURCC('s','t','c','o'): { - int temp=stream_read_dword(demuxer->stream); + stream_read_dword(demuxer->stream); int len=stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*sChunk offset table! (%d chunks)\n",level,"",len); @@ -596,7 +596,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak break; } case MOV_FOURCC('c','o','6','4'): { - int temp=stream_read_dword(demuxer->stream); + stream_read_dword(demuxer->stream); int len=stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*s64bit chunk offset table! (%d chunks)\n",level,"",len); diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index bdc28fd618..e20307fda7 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -406,9 +406,9 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){ } int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){ - demux_stream_t *d_audio=demuxer->audio; +/* demux_stream_t *d_audio=demuxer->audio;*/ demux_stream_t *d_video=demuxer->video; - sh_audio_t *sh_audio=d_audio->sh; +/* sh_audio_t *sh_audio=d_audio->sh;*/ sh_video_t *sh_video=d_video->sh; switch(cmd) { diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c index 911e15158e..af6c05951d 100644 --- a/libmpdemux/demux_pva.c +++ b/libmpdemux/demux_pva.c @@ -280,7 +280,9 @@ int pva_get_payload(demuxer_t * d,pva_payload_t * payload) uint16_t pack_size; off_t next_offset,pva_payload_start; unsigned char buffer[256]; +#ifndef PVA_NEW_PREBYTES_CODE demux_packet_t * dp; //hack to deliver the preBytes (see PVA doc) +#endif pva_priv_t * priv=(pva_priv_t *) d->priv; diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 4988cc9633..6e852b62c1 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -354,7 +354,9 @@ int demux_real_fill_buffer(demuxer_t *demuxer) int len; int timestamp; int stream_id; +#ifdef CRACK_MATRIX int i; +#endif int flags; int version; int reserved; diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 9ca575a6c0..1d560451d8 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -708,7 +708,7 @@ if (demuxer->audio->id >= -1){ if (vivo_param_bytesperblock != -1) sh->wf->nBlockAlign = vivo_param_bytesperblock; -sound_ok: +/*sound_ok:*/ /* insert as stream */ demuxer->audio->sh=sh; sh->ds=demuxer->audio; diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index 5c3b05bb13..2653c364fd 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -29,6 +29,7 @@ int tv_param_on = 0; #include "stheader.h" #include "../libao2/afmt.h" +#include "../libao2/audio_out.h" #include "../libvo/img_format.h" #include "../libvo/fastmemcpy.h" diff --git a/libmpdemux/tvi_v4l.c b/libmpdemux/tvi_v4l.c index 91b3a3ee5a..c77e4e9229 100644 --- a/libmpdemux/tvi_v4l.c +++ b/libmpdemux/tvi_v4l.c @@ -1324,7 +1324,7 @@ static void *audio_grabber(void *data) priv_t *priv = (priv_t*)data; struct timeval tv; int i, audio_skew_ptr = 0; - long long tmp, current_time, prev_skew = 0; + long long /*tmp,*/ current_time, prev_skew = 0; pthread_mutex_lock(&priv->audio_starter); diff --git a/libmpdvdkit2/nav_read.c b/libmpdvdkit2/nav_read.c index e8c196cb0d..cb51af758e 100644 --- a/libmpdvdkit2/nav_read.c +++ b/libmpdvdkit2/nav_read.c @@ -95,7 +95,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) { /* pci hli btnit */ for(i = 0; i < pci->hli.hl_gi.btngr_ns; i++) { for(j = 0; j < (36 / pci->hli.hl_gi.btngr_ns); j++) { - int n = (36 / pci->hli.hl_gi.btngr_ns) * i + j; +/* int n = (36 / pci->hli.hl_gi.btngr_ns) * i + j;*/ assert(pci->hli.btnit[n].zero1 == 0); assert(pci->hli.btnit[n].zero2 == 0); assert(pci->hli.btnit[n].zero3 == 0); diff --git a/libvo/geometry.c b/libvo/geometry.c index 1823a7b4c2..24eafa1ef9 100644 --- a/libvo/geometry.c +++ b/libvo/geometry.c @@ -2,7 +2,7 @@ #include "geometry.h" #include "../mp_msg.h" -// #include "../mplayer.h" /* exit_player() */ +#include "../mplayer.h" /* exit_player() */ #include <string.h> #include <stdlib.h> /* strtol */ diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index c4624db3a3..c02a243454 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -472,7 +472,7 @@ static void gl_set_antialias (int val) static void drawTextureDisplay () { struct TexSquare *square; - int x, y, xoff=0, yoff=0, wd, ht; + int x, y/*, xoff=0, yoff=0, wd, ht*/; GLenum err; glColor3f(1.0,1.0,1.0); diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index a4599debfe..1032ab9c91 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -32,6 +32,7 @@ #include "vosub_vidix.h" #include "../vidix/vidixlib.h" +#include "../mplayer.h" /* exit_player() */ #ifdef HAVE_NEW_GUI #include "../Gui/interface.h" diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index b7c3d05123..8a23c9585a 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -49,7 +49,7 @@ static vidix_playback_t vidix_play; static vidix_fourcc_t vidix_fourcc; static vo_functions_t * vo_server; static vidix_yuv_t dstrides; -static uint32_t (*server_control)(uint32_t request, void *data, ...); +/*static uint32_t (*server_control)(uint32_t request, void *data, ...);*/ static int vidix_get_video_eq(vidix_video_eq_t *info); static int vidix_set_video_eq(const vidix_video_eq_t *info); @@ -1368,7 +1368,7 @@ int too_fast_frame_cnt=0; float AV_delay=0; // average of A-V timestamp differences double vdecode_time; unsigned int lastframeout_ts=0; -float time_frame_corr_avg=0; +/*float time_frame_corr_avg=0;*/ /* unused */ float next_frame_time=0; int frame_time_remaining=0; // flag diff --git a/postproc/postprocess_template.c b/postproc/postprocess_template.c index 3289bb18f8..a75c9b4dc8 100644 --- a/postproc/postprocess_template.c +++ b/postproc/postprocess_template.c @@ -2658,7 +2658,10 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int int black=0, white=255; // blackest black and whitest white in the picture int QPCorrecture= 256*256; - int copyAhead, i; + int copyAhead; +#ifdef HAVE_MMX + int i; +#endif //FIXME remove uint64_t * const yHistogram= c.yHistogram; diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c index 0bc0457717..1f64218eaa 100644 --- a/postproc/swscale_template.c +++ b/postproc/swscale_template.c @@ -1256,7 +1256,9 @@ YSCALE_YUV_2_ANYRGB_C(YSCALE_YUV_2_RGB2_C, YSCALE_YUV_2_PACKED2_C) static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t *uvbuf0, uint16_t *uvbuf1, uint8_t *dest, int dstW, int uvalpha, int dstFormat, int flags, int y) { +#ifdef HAVE_MMX int uvalpha1=uvalpha^4095; +#endif const int yalpha1=0; int i; |