diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-16 01:10:31 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-16 01:10:31 +0000 |
commit | ce04a5f4019837af8250b3c7884d5570d70f08ff (patch) | |
tree | 04c47a816653381811cb4ef960be04e3e4989267 | |
parent | 98a08e34c099d1d7f8457759093bf59fe4d977ea (diff) | |
download | mpv-ce04a5f4019837af8250b3c7884d5570d70f08ff.tar.bz2 mpv-ce04a5f4019837af8250b3c7884d5570d70f08ff.tar.xz |
handle error from mpcodecs_config_vo()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5125 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpcodecs/vd_cinepak.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vd_cyuv.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_divx4.c | 5 | ||||
-rw-r--r-- | libmpcodecs/vd_dshow.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_fli.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_ijpg.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_libmpeg2.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_mpng.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_msvidc.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_nuv.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_odivx.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_qtrle.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_qtrpza.c | 5 | ||||
-rw-r--r-- | libmpcodecs/vd_qtsmc.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_raw.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_rle.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_roqvideo.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_vfw.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vd_xanim.c | 2 |
20 files changed, 22 insertions, 38 deletions
diff --git a/libmpcodecs/vd_cinepak.c b/libmpcodecs/vd_cinepak.c index 1c33bb796a..ac96918188 100644 --- a/libmpcodecs/vd_cinepak.c +++ b/libmpcodecs/vd_cinepak.c @@ -22,14 +22,12 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ return CONTROL_UNKNOWN; } -//int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt); void *decode_cinepak_init(void); // init driver static int init(sh_video_t *sh){ sh->context = decode_cinepak_init(); - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2); } // uninit driver diff --git a/libmpcodecs/vd_cyuv.c b/libmpcodecs/vd_cyuv.c index aba0d91baa..9e936b0715 100644 --- a/libmpcodecs/vd_cyuv.c +++ b/libmpcodecs/vd_cyuv.c @@ -24,8 +24,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_UYVY); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_UYVY); } // uninit driver diff --git a/libmpcodecs/vd_divx4.c b/libmpcodecs/vd_divx4.c index 603111e4e8..5e6f75a3fd 100644 --- a/libmpcodecs/vd_divx4.c +++ b/libmpcodecs/vd_divx4.c @@ -74,9 +74,10 @@ static int init(sh_video_t *sh){ DEC_PARAM dec_param; DEC_SET dec_set; int bits=16; - memset(&dec_param,0,sizeof(dec_param)); - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2); + if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2)) return 0; + + memset(&dec_param,0,sizeof(dec_param)); switch(sh->codec->outfmt[sh->outfmtidx]){ case IMGFMT_YV12: dec_param.output_format=DEC_YV12;bits=12;break; diff --git a/libmpcodecs/vd_dshow.c b/libmpcodecs/vd_dshow.c index b7fa7306b6..a0f8738c85 100644 --- a/libmpcodecs/vd_dshow.c +++ b/libmpcodecs/vd_dshow.c @@ -57,7 +57,7 @@ static int init(sh_video_t *sh){ mp_msg(MSGT_DECVIDEO,MSGL_HINT,"package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.zip !\n"); return 0; } - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2); + if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2)) return 0; out_fmt=sh->codec->outfmt[sh->outfmtidx]; switch(out_fmt){ case IMGFMT_YUY2: diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index f226e4c5a6..f66d8c264c 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -71,8 +71,7 @@ static int init(sh_video_t *sh){ return 0; } mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n"); - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); } // uninit driver diff --git a/libmpcodecs/vd_fli.c b/libmpcodecs/vd_fli.c index 2f62e4d1ba..0baea4f8d8 100644 --- a/libmpcodecs/vd_fli.c +++ b/libmpcodecs/vd_fli.c @@ -35,7 +35,7 @@ void decode_fli_frame( // init driver static int init(sh_video_t *sh){ - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24); + if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24)) return 0; sh->context = init_fli_decoder(sh->disp_w, sh->disp_h); return 1; } diff --git a/libmpcodecs/vd_ijpg.c b/libmpcodecs/vd_ijpg.c index 4229e02393..0a89500173 100644 --- a/libmpcodecs/vd_ijpg.c +++ b/libmpcodecs/vd_ijpg.c @@ -159,7 +159,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ { last_w=width; last_h=height; last_c=out_fmt; if ( !out_fmt ) return NULL; - mpcodecs_config_vo( sh,width,height,out_fmt ); + if(!mpcodecs_config_vo( sh,width,height,out_fmt )) return NULL; } mpi=mpcodecs_get_image( sh,MP_IMGTYPE_TEMP,MP_IMGFLAG_ACCEPT_STRIDE,width,height ); diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index 64587abec6..26c72b1994 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -38,8 +38,7 @@ static int init(sh_video_t *sh){ // send seq header to the decoder: *** HACK *** mpeg2_decode_data(NULL,videobuffer,videobuffer+videobuf_len,0); mpeg2_allocate_image_buffers (picture); - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); } // uninit driver diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c index e7adb81517..4689777c2f 100644 --- a/libmpcodecs/vd_mpng.c +++ b/libmpcodecs/vd_mpng.c @@ -109,7 +109,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ if(last_w!=png_width || last_h!=png_height || last_c!=out_fmt){ last_w=png_width; last_h=png_height; last_c=out_fmt; if(!out_fmt) return NULL; - mpcodecs_config_vo(sh,png_width,png_height,out_fmt); + if(!mpcodecs_config_vo(sh,png_width,png_height,out_fmt)) return NULL; } #if 0 diff --git a/libmpcodecs/vd_msvidc.c b/libmpcodecs/vd_msvidc.c index 2e92da73a6..213deace77 100644 --- a/libmpcodecs/vd_msvidc.c +++ b/libmpcodecs/vd_msvidc.c @@ -24,8 +24,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24); } // uninit driver diff --git a/libmpcodecs/vd_nuv.c b/libmpcodecs/vd_nuv.c index b6cebe2449..32bec90b8f 100644 --- a/libmpcodecs/vd_nuv.c +++ b/libmpcodecs/vd_nuv.c @@ -24,8 +24,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_I420); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_I420); } // uninit driver diff --git a/libmpcodecs/vd_odivx.c b/libmpcodecs/vd_odivx.c index 4d1d940798..5e4ea0ce50 100644 --- a/libmpcodecs/vd_odivx.c +++ b/libmpcodecs/vd_odivx.c @@ -118,8 +118,7 @@ static int init(sh_video_t *sh){ mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: OpenDivX video codec init OK!\n"); - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); } // uninit driver diff --git a/libmpcodecs/vd_qtrle.c b/libmpcodecs/vd_qtrle.c index 83b309f101..0ec9694549 100644 --- a/libmpcodecs/vd_qtrle.c +++ b/libmpcodecs/vd_qtrle.c @@ -33,8 +33,7 @@ static int init(sh_video_t *sh){ return 0; } - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24); } // uninit driver diff --git a/libmpcodecs/vd_qtrpza.c b/libmpcodecs/vd_qtrpza.c index c1ea74fe3f..3f38d8ff62 100644 --- a/libmpcodecs/vd_qtrpza.c +++ b/libmpcodecs/vd_qtrpza.c @@ -22,12 +22,9 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ return CONTROL_UNKNOWN; } -//int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt); - // init driver static int init(sh_video_t *sh){ - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR16); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR16); } // uninit driver diff --git a/libmpcodecs/vd_qtsmc.c b/libmpcodecs/vd_qtsmc.c index 1dc6ebf666..8c5bf16da2 100644 --- a/libmpcodecs/vd_qtsmc.c +++ b/libmpcodecs/vd_qtsmc.c @@ -31,8 +31,7 @@ static int init(sh_video_t *sh){ return 0; } - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24); } // uninit driver diff --git a/libmpcodecs/vd_raw.c b/libmpcodecs/vd_raw.c index 666f70b9d0..1049c65e51 100644 --- a/libmpcodecs/vd_raw.c +++ b/libmpcodecs/vd_raw.c @@ -40,8 +40,7 @@ static int init(sh_video_t *sh){ mp_msg(MSGT_DECVIDEO,MSGL_WARN,"RAW: depth %d not supported\n",sh->bih->biBitCount); } } - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,sh->format); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,sh->format); } // uninit driver diff --git a/libmpcodecs/vd_rle.c b/libmpcodecs/vd_rle.c index b25e28ab6c..ff29c455e8 100644 --- a/libmpcodecs/vd_rle.c +++ b/libmpcodecs/vd_rle.c @@ -24,7 +24,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24); + if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_BGR24)) return 0; if( (((sh->codec->outfmt[sh->outfmtidx]&255)+7)/8)==2 ){ unsigned int* pal=(unsigned int*)(((char*)sh->bih)+40); int cols=(sh->bih->biSize-40)/4; diff --git a/libmpcodecs/vd_roqvideo.c b/libmpcodecs/vd_roqvideo.c index 5aaf20c46f..f63b83bac8 100644 --- a/libmpcodecs/vd_roqvideo.c +++ b/libmpcodecs/vd_roqvideo.c @@ -27,8 +27,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ sh->context = roq_decode_video_init(); - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); } // uninit driver diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index dfd47bee5b..ca736827ea 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -54,9 +54,7 @@ static int init(sh_video_t *sh){ unsigned int out_fmt; if(!init_vfw_video_codec(sh,(sh->codec->driver==VFM_VFWEX))) return 0; mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32 video codec init OK!\n"); - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2); -// out_fmt=sh->codec->outfmt[sh->outfmtidx]; - return 1; + return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2); } // uninit driver diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c index 85c2ae8929..4b4b176f86 100644 --- a/libmpcodecs/vd_xanim.c +++ b/libmpcodecs/vd_xanim.c @@ -28,7 +28,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,sh->format); + if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,sh->format)) return 0; return xacodec_init_video(sh,sh->codec->outfmt[sh->outfmtidx]); } |