summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ijpg.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-11 08:42:07 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-11 08:42:07 +0000
commit78afcadf2ee44c191822d124f1d5ac6c0e016af1 (patch)
tree825dbd7c322aaf94e43422108dda5a30bb24f8a6 /libmpcodecs/vd_ijpg.c
parentaf9775283614e0d7b8639d2bc017b31758cef4c9 (diff)
downloadmpv-78afcadf2ee44c191822d124f1d5ac6c0e016af1.tar.bz2
mpv-78afcadf2ee44c191822d124f1d5ac6c0e016af1.tar.xz
kill few warning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5043 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_ijpg.c')
-rw-r--r--libmpcodecs/vd_ijpg.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libmpcodecs/vd_ijpg.c b/libmpcodecs/vd_ijpg.c
index a2acb24c68..e8648dbc77 100644
--- a/libmpcodecs/vd_ijpg.c
+++ b/libmpcodecs/vd_ijpg.c
@@ -30,7 +30,7 @@ static unsigned int out_fmt=0;
static int last_w=-1;
static int last_h=-1;
-static int last_c=-1;
+static unsigned int last_c=-1;
// to set/get/query special features/parameters
static int control(sh_video_t *sh,int cmd,void* arg,...){
@@ -123,7 +123,6 @@ METHODDEF(void) my_error_exit (j_common_ptr cinfo)
static struct jpeg_decompress_struct cinfo;
static struct my_error_mgr jerr;
static int row_stride;
-static int count;
// decode a frame
static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
@@ -169,7 +168,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
for ( i=0;i < height;i++ )
{
char * row = mpi->planes[0] + mpi->stride[0] * i;
- jpeg_read_scanlines( &cinfo,&row,1 );
+ jpeg_read_scanlines( &cinfo,(JSAMPLE**)&row,1 );
#warning workaround for rgb2bgr
if ( depth == 24 )
for ( j=0;j < width * 3;j+=3 )