# HG changeset patch # User reimar # Date 1266348881 0 # Node ID 10b0a635293baa1f18d5adbd0160ce813fd30a39 # Parent 71acebef19ec81543a4d162cb9782f1c2ec4ac16 Remove unused XPM-loading function pixbuf_load_xpm() from spuenc.c. Remove unused function pixbuf_delete() from spuenc.[ch]. diff -r 71acebef19ec -r 10b0a635293b libvo/spuenc.c --- a/libvo/spuenc.c Tue Feb 16 19:07:06 2010 +0000 +++ b/libvo/spuenc.c Tue Feb 16 19:34:41 2010 +0000 @@ -229,50 +229,3 @@ } encode_do_control(x,y, ed, &pb); } - - -static void -pixbuf_load_xpm( pixbuf* pb, char* xpm[] ) { - int colors, chrs, l, n; - char c[4], table[256]; - unsigned char *b, *i; - - sscanf( xpm[0], "%d %d %d %d", &pb->x, &pb->y, &colors, &chrs); - if( colors > 4 ) { - fprintf( stderr, "the pixmap MUST be 4 colors or less\n"); - exit (-1); - } - if( chrs != 1 ) { - fprintf( stderr, "the XPM format MUST be 1 char per pixel\n"); - exit (-1); - } - if( pb->x > 0xFFF || pb->y > 0xFFF ) { - fprintf( stderr, "the size is excesive\n"); - exit (-1); - } - - for( l=0; lrgb[l]); - if( n < 2 ) { - /* this one is transparent */ - pb->rgb[l]=0xff000000; - } - table[(int)c[l]]=l; - } - - pb->pixels= malloc( pb->x * pb->y ); - b= pb->pixels; - - for( l= colors+1; l <= pb->y + colors; l++ ) { - i= xpm[l]; - while( (int)*i) { - *b++ = table[*i++]; - } - } -} - -static void -pixbuf_delete( pixbuf* pb ) { - free( pb->pixels ); -} - diff -r 71acebef19ec -r 10b0a635293b libvo/spuenc.h --- a/libvo/spuenc.h Tue Feb 16 19:07:06 2010 +0000 +++ b/libvo/spuenc.h Tue Feb 16 19:34:41 2010 +0000 @@ -41,6 +41,5 @@ } encodedata; void pixbuf_encode_rle(int x, int y, int w, int h, char *inbuf, int stride, encodedata *ed); -void pixbuf_delete(pixbuf* pb); #endif /* MPLAYER_SPUENC_H */