RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge declaration and initialization. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30647 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-02-18 22:37:08 +00:00
parent 6d2c5ad18d
commit 7e808d390c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmpcodecs/vd_dmo.c
View File

@ -46,13 +46,12 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
// init driver
static int init(sh_video_t *sh){
unsigned int out_fmt;
unsigned int out_fmt=sh->codec->outfmt[sh->outfmtidx];
if(!(sh->context=DMO_VideoDecoder_Open(sh->codec->dll,&sh->codec->guid, sh->bih, 0, 0))){
mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh->codec->dll);
mp_msg(MSGT_DECVIDEO,MSGL_HINT,MSGTR_DownloadCodecPackage);
return 0;
}
out_fmt=sh->codec->outfmt[sh->outfmtidx];
if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,out_fmt)) return 0;
switch(out_fmt){
case IMGFMT_YUY2:

3
libmpcodecs/vd_dshow.c
View File

@ -66,7 +66,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
// init driver
static int init(sh_video_t *sh){
unsigned int out_fmt;
unsigned int out_fmt=sh->codec->outfmt[sh->outfmtidx];
/* Hack for VSSH codec: new dll can't decode old files
* In my samples old files have no extradata, so use that info
@ -80,7 +80,6 @@ static int init(sh_video_t *sh){
mp_msg(MSGT_DECVIDEO,MSGL_HINT,MSGTR_DownloadCodecPackage);
return 0;
}
out_fmt=sh->codec->outfmt[sh->outfmtidx];
if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,out_fmt)) return 0;
switch(out_fmt){
case IMGFMT_YUY2: