Mercurial > mplayer.hg

changeset 30605:a9c86e91de71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge declaration and initialization.
author reimar
date Thu, 18 Feb 2010 22:37:08 +0000
parents bc87504d1d6a
children caaa73737ef1
files libmpcodecs/vd_dmo.c libmpcodecs/vd_dshow.c
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vd_dmo.c	Thu Feb 18 22:34:27 2010 +0000
+++ b/libmpcodecs/vd_dmo.c	Thu Feb 18 22:37:08 2010 +0000
@@ -46,13 +46,12 @@
 
 // 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:
--- a/libmpcodecs/vd_dshow.c	Thu Feb 18 22:34:27 2010 +0000
+++ b/libmpcodecs/vd_dshow.c	Thu Feb 18 22:37:08 2010 +0000
@@ -66,7 +66,7 @@
 
 // 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 @@
         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: