# HG changeset patch
# User reimar
# Date 1266532628 0
# Node ID a9c86e91de71b33c1fe6639eacd57938f1218e94
# Parent  bc87504d1d6a5b417e5a1155f1710b8c01c295ce
Merge declaration and initialization.

diff -r bc87504d1d6a -r a9c86e91de71 libmpcodecs/vd_dmo.c
--- 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:
diff -r bc87504d1d6a -r a9c86e91de71 libmpcodecs/vd_dshow.c
--- 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: