From 7e808d390cc59245fa3b99d5ed164cd431029f64 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 18 Feb 2010 22:37:08 +0000
Subject: [PATCH] Merge declaration and initialization.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30647 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/vd_dmo.c   | 3 +--
 libmpcodecs/vd_dshow.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libmpcodecs/vd_dmo.c b/libmpcodecs/vd_dmo.c
index c56794d2d9..df4a836b68 100644
--- a/libmpcodecs/vd_dmo.c
+++ b/libmpcodecs/vd_dmo.c
@@ -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:
diff --git a/libmpcodecs/vd_dshow.c b/libmpcodecs/vd_dshow.c
index 71b2e20f2d..8a1d29c321 100644
--- a/libmpcodecs/vd_dshow.c
+++ b/libmpcodecs/vd_dshow.c
@@ -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: