mirror of
https://github.com/mpv-player/mpv
synced 2024-12-24 15:52:25 +00:00
Remove unused variables, patch by Stefan Huehner, stefan ##at## huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18981 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
4a3877c93a
commit
e364249f21
@ -242,7 +242,7 @@ void Render( wsTWindow * window,wItem * Items,int nrItems,char * db,int size )
|
||||
{
|
||||
wItem * item;
|
||||
txSample * image = NULL;
|
||||
int i, type;
|
||||
int i;
|
||||
|
||||
image_buffer=db;
|
||||
image_width=window->Width;
|
||||
|
@ -321,7 +321,6 @@ void ShowFileSelect( int type,int modal )
|
||||
|
||||
if ( fsTopList_items ) g_list_free( fsTopList_items ); fsTopList_items=NULL;
|
||||
{
|
||||
char * hist;
|
||||
int i, c = 1;
|
||||
|
||||
if ( fsType == fsVideoSelector )
|
||||
@ -562,19 +561,11 @@ gboolean on_FileSelect_key_release_event( GtkWidget * widget,GdkEventKey * event
|
||||
|
||||
GtkWidget * create_FileSelect( void )
|
||||
{
|
||||
GtkWidget * FSFrame;
|
||||
GtkWidget * frame2;
|
||||
GtkWidget * frame3;
|
||||
GtkWidget * frame4;
|
||||
GtkWidget * vbox4;
|
||||
GtkWidget * hbox4;
|
||||
GtkWidget * vseparator1;
|
||||
GtkWidget * hseparator1;
|
||||
GtkWidget * hbox6;
|
||||
GtkWidget * fsFNameListWindow;
|
||||
GtkWidget * label1;
|
||||
GtkWidget * hseparator2;
|
||||
GtkWidget * hseparator3;
|
||||
GtkWidget * hbuttonbox3;
|
||||
|
||||
GtkWidget * uppixmapwid;
|
||||
|
@ -761,7 +761,6 @@ GtkWidget * create_Preferences( void )
|
||||
GtkWidget * hbox1;
|
||||
GtkWidget * vbox2;
|
||||
GtkWidget * scrolledwindow3;
|
||||
GtkWidget * hbuttonbox2;
|
||||
GtkWidget * vbox3;
|
||||
GtkWidget * hbox8;
|
||||
GtkWidget * hbox2;
|
||||
@ -769,7 +768,6 @@ GtkWidget * create_Preferences( void )
|
||||
GtkWidget * scrolledwindow2;
|
||||
GtkWidget * hbuttonbox3;
|
||||
GtkWidget * vbox5;
|
||||
GtkWidget * hbox3;
|
||||
GtkWidget * vbox6;
|
||||
GtkWidget * vbox600;
|
||||
GSList * OSD_group = NULL;
|
||||
|
@ -53,9 +53,6 @@ int i,pot = 0;
|
||||
|
||||
void mplMainDraw( void )
|
||||
{
|
||||
wItem * item;
|
||||
txSample * image = NULL;
|
||||
int i, type;
|
||||
|
||||
if ( appMPlayer.mainWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );
|
||||
|
||||
|
@ -148,11 +148,10 @@ int fntTextHeight( int id,char * str )
|
||||
|
||||
txSample * fntRender( wItem * item,int px,char * fmt,... )
|
||||
{
|
||||
txSample * tmp = NULL;
|
||||
va_list ap;
|
||||
unsigned char p[512];
|
||||
unsigned int c;
|
||||
int i, dx = 0, s, tw, fbw, iw, id, ofs;
|
||||
int i, dx = 0, tw, fbw, iw, id, ofs;
|
||||
int x,y,fh,fw,fyc,yc;
|
||||
uint32_t * ibuf;
|
||||
uint32_t * obuf;
|
||||
|
@ -298,8 +298,7 @@ static int play(void* data, int len, int flags)
|
||||
int offs;
|
||||
int nwritten;
|
||||
int nsamples;
|
||||
int remainder, n;
|
||||
int saved_fl;
|
||||
int n;
|
||||
|
||||
/* round down buffersize to a multiple of ESD_BUF_SIZE bytes */
|
||||
len = len / ESD_BUF_SIZE * ESD_BUF_SIZE;
|
||||
|
@ -608,7 +608,6 @@ static int decide_frame_length(struct pullup_context *c)
|
||||
static void print_aff_and_breaks(struct pullup_context *c, struct pullup_field *f)
|
||||
{
|
||||
int i;
|
||||
int max_l, max_r, l;
|
||||
struct pullup_field *f0 = f;
|
||||
const char aff_l[] = "+..", aff_r[] = "..+";
|
||||
printf("\naffinity: ");
|
||||
@ -698,7 +697,6 @@ static void copy_field(struct pullup_context *c, struct pullup_buffer *dest,
|
||||
void pullup_pack_frame(struct pullup_context *c, struct pullup_frame *fr)
|
||||
{
|
||||
int i;
|
||||
int par = fr->parity;
|
||||
if (fr->buffer) return;
|
||||
if (fr->length < 2) return; /* FIXME: deal with this */
|
||||
for (i = 0; i < 2; i++)
|
||||
|
@ -142,7 +142,6 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags)
|
||||
ogg_packet op;
|
||||
yuv_buffer yuv;
|
||||
mp_image_t* mpi;
|
||||
int i;
|
||||
|
||||
memset (&op, 0, sizeof (op));
|
||||
op.bytes = len;
|
||||
|
@ -911,10 +911,6 @@ static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){
|
||||
if(lavc_param_psnr){
|
||||
static FILE *fvstats=NULL;
|
||||
char filename[20];
|
||||
static long long int all_len=0;
|
||||
static int frame_number=0;
|
||||
static double all_frametime=0.0;
|
||||
AVFrame *pic= lavc_venc_context->coded_frame;
|
||||
double f= lavc_venc_context->width*lavc_venc_context->height*255.0*255.0;
|
||||
double quality=0.0;
|
||||
int8_t *q;
|
||||
@ -970,7 +966,6 @@ static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){
|
||||
}
|
||||
|
||||
static void uninit(struct vf_instance_s* vf){
|
||||
const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
|
||||
|
||||
#if LIBAVCODEC_BUILD >= 4643
|
||||
if(lavc_param_psnr){
|
||||
|
@ -177,7 +177,6 @@ static int analyze_fixed_pattern(struct vf_priv_s *p, mp_image_t *new, mp_image_
|
||||
|
||||
static int analyze_aggressive(struct vf_priv_s *p, mp_image_t *new, mp_image_t *old)
|
||||
{
|
||||
int i;
|
||||
struct metrics m, pm;
|
||||
|
||||
if (p->frame >= 0) p->frame = (p->frame+1)%5;
|
||||
|
@ -18,7 +18,6 @@ struct vf_priv_s {
|
||||
static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
|
||||
{
|
||||
mp_image_t *dmpi;
|
||||
int ret;
|
||||
|
||||
vf->priv->last_mpi = mpi;
|
||||
|
||||
|
@ -91,7 +91,6 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
|
||||
int n = vf->priv->frame++;
|
||||
int val, hi, lo, w, h;
|
||||
double valf;
|
||||
unsigned int hint;
|
||||
int plane;
|
||||
int threshold = vf->priv->thresh;
|
||||
int order = vf->priv->order;
|
||||
@ -289,8 +288,6 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
|
||||
}
|
||||
|
||||
static int open(vf_instance_t *vf, char* args){
|
||||
double LumSpac, LumTmp, ChromSpac, ChromTmp;
|
||||
double Param1, Param2, Param3;
|
||||
|
||||
vf->config=config;
|
||||
vf->put_image=put_image;
|
||||
|
@ -535,8 +535,6 @@ void load_pgm_skip(FILE *f) {
|
||||
*/
|
||||
pgm_structure * load_pgm(const char * file_name)
|
||||
{
|
||||
unsigned char flags;
|
||||
int x, y;
|
||||
int maximum_greyscale_value;
|
||||
FILE * input;
|
||||
int pnm_number;
|
||||
|
@ -177,7 +177,7 @@ static void filter(struct vf_priv_s *p, uint8_t *dst[3], uint8_t *src[3], int ds
|
||||
for(i=0; i<count; i++){
|
||||
const int x1= offset[i+count-1][0];
|
||||
const int y1= offset[i+count-1][1];
|
||||
int offset, out_size, got_picture;
|
||||
int offset, out_size;
|
||||
p->frame->data[0]= p->src[0] + x1 + y1 * p->frame->linesize[0];
|
||||
p->frame->data[1]= p->src[1] + x1/2 + y1/2 * p->frame->linesize[1];
|
||||
p->frame->data[2]= p->src[2] + x1/2 + y1/2 * p->frame->linesize[2];
|
||||
|
@ -286,7 +286,6 @@ static void fillblock(char *strt, int yoff, int lines, int val)
|
||||
static int draw_frame(uint8_t * src[])
|
||||
{
|
||||
|
||||
int vp_skip = vo_dga_vp_skip;
|
||||
int numlines = vo_dga_lines;
|
||||
|
||||
char *s, *d;
|
||||
|
@ -383,7 +383,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
|
||||
if (WinID)
|
||||
{
|
||||
int border;
|
||||
Window win;
|
||||
XUnmapWindow(mDisplay, vo_window);
|
||||
XChangeWindowAttributes(mDisplay, vo_window, xswamask,
|
||||
&xswa);
|
||||
|
@ -488,7 +488,6 @@ int vixConfigPlayback(vidix_playback_t *info)
|
||||
|
||||
if(CRINB(0xd1)&0x80)
|
||||
{
|
||||
int hcorr,vcorr;
|
||||
int TVHTotal,TVVTotal,TVHSyncStart,TVVSyncStart,TVOverflow;
|
||||
LOGWRITE("[cyberblade] Using TV-CRTC\n");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user