diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-18 03:08:21 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-18 03:08:21 +0000 |
| commit | abd753a40311ca7dee57f0d0ac6d41a878d4ab41 (patch) | |
| tree | ee4b46386a95b678a0c612851a9010131ad7c2e4 /libmpcodecs/vd.c | |
| parent | 43d8c8eb9384dd1650d2f6bb5339ef353e953b73 (diff) | |
| download | mpv-abd753a40311ca7dee57f0d0ac6d41a878d4ab41.tar.bz2 mpv-abd753a40311ca7dee57f0d0ac6d41a878d4ab41.tar.xz | |
supports query_format in codecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5181 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd.c')
| -rw-r--r-- | libmpcodecs/vd.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index a7a87bf6cf..6c7717c9e1 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -108,6 +108,8 @@ static mp_image_t* temp_images[1]; static mp_image_t* export_images[1]; static int static_idx=0; +extern vd_functions_t* mpvdec; // FIXME! + int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt){ int i,j; unsigned int out_fmt=0; @@ -127,9 +129,12 @@ int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outf if(out_fmt==(signed int)0xFFFFFFFF) continue; vo_flags=video_out->control(VOCTRL_QUERY_FORMAT, &out_fmt); mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X (i=%d) \n",vo_format_name(out_fmt),vo_flags,i); - // TODO: check (query) if codec really support this outfmt... - if(vo_flags&2){j=i; break;} - if(vo_flags && j<0) j=i; + if((vo_flags&2) || (vo_flags && j<0)){ + // check (query) if codec really support this outfmt... + if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE) + continue; + j=i; if(vo_flags&2) break; + } } if(j<0){ // TODO: no match - we should use conversion... |