github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-07-31 16:29:58 +02:00
Code Releases Activity

warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8255 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2002-11-23 10:58:14 +00:00
parent 0f889e9f64
commit 01c201dbe8
24 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
divx4_vbr.c
View File

@ -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",

2
input/input.c
View File

@ -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;

17
liba52/imdct.c
View File

@ -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;

5
liba52/imdct_3dnow.h
View File

@ -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;

2
libmpcodecs/Makefile
View File

@ -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

2
libmpcodecs/vd_huffyuv.c
View File

@ -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;

2
libmpdemux/audio_in.c
View File

@ -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

4
libmpdemux/demux_asf.c
View File

@ -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);

4
libmpdemux/demux_avi.c
View File

@ -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;

6
libmpdemux/demux_mov.c
View File

@ -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);

4
libmpdemux/demux_mpg.c
View File

@ -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) {

2
libmpdemux/demux_pva.c
View File

@ -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;

2
libmpdemux/demux_real.c
View File

@ -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;

2
libmpdemux/demux_viv.c
View File

@ -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;

1
libmpdemux/tv.c
View File

@ -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"

2
libmpdemux/tvi_v4l.c
View File

@ -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);

2
libmpdvdkit2/nav_read.c
View File

@ -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);

2
libvo/geometry.c
View File

@ -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 */

2
libvo/vo_gl2.c
View File

@ -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);

1
libvo/vo_xvidix.c
View File

@ -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"

2
libvo/vosub_vidix.c
View File

@ -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);

2
mplayer.c
View File

@ -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

5
postproc/postprocess_template.c
View File

@ -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;

2
postproc/swscale_template.c
View File

@ -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;