diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-22 12:12:42 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-22 12:12:42 +0000 |
| commit | 413bd92bb5ad70d63e6120e89c447a5e0b1309c2 (patch) | |
| tree | c2a9d47a4734248bc9a9d6165a8e519479dd337c /libmpcodecs | |
| parent | 3a376cd09cbb25fcd3a1a883cd444f6412c1b391 (diff) | |
| download | mpv-413bd92bb5ad70d63e6120e89c447a5e0b1309c2.tar.bz2 mpv-413bd92bb5ad70d63e6120e89c447a5e0b1309c2.tar.xz | |
don't require sh->bih (should fix v4l)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6503 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_raw.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libmpcodecs/vd_raw.c b/libmpcodecs/vd_raw.c index 6597b772ce..1f1e433c1e 100644 --- a/libmpcodecs/vd_raw.c +++ b/libmpcodecs/vd_raw.c @@ -21,7 +21,7 @@ LIBVD_EXTERN(raw) static int control(sh_video_t *sh,int cmd,void* arg,...){ switch(cmd){ case VDCTRL_QUERY_FORMAT: - if( (*((int*)arg)) == sh->bih->biCompression ) return CONTROL_TRUE; + if( (*((int*)arg)) == (sh->bih ? sh->bih->biCompression : sh->format) ) return CONTROL_TRUE; return CONTROL_FALSE; } return CONTROL_UNKNOWN; @@ -29,9 +29,8 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ - if(!sh->bih) return 0; // bih is required // set format fourcc for raw RGB: - if(sh->bih->biCompression==0){ // set based on bit depth + if(sh->bih && sh->bih->biCompression==0){ // set based on bit depth switch(sh->bih->biBitCount){ case 8: sh->bih->biCompression=IMGFMT_BGR8; break; case 15: sh->bih->biCompression=IMGFMT_BGR15; break; @@ -43,7 +42,7 @@ static int init(sh_video_t *sh){ mp_msg(MSGT_DECVIDEO,MSGL_WARN,"RAW: depth %d not supported\n",sh->bih->biBitCount); } } - return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,sh->bih->biCompression); + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,sh->bih ? sh->bih->biCompression : sh->format); } // uninit driver @@ -90,7 +89,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ if(sh->format==0 || sh->format==3) mpi->stride[0]=(mpi->stride[0]+3)&(~3); if(mpi->imgfmt==IMGFMT_RGB8 || mpi->imgfmt==IMGFMT_BGR8){ // export palette: - mpi->planes[1]=((unsigned char*)&sh->bih)+40; + mpi->planes[1]=sh->bih ? (((unsigned char*)&sh->bih)+40) : NULL; } } |