- changed -bpp again: if vo driver obeys depth value set by user, then

  the codec should do the same ...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@392 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 7 insertions, 6 deletions

diff --git a/mplayer.c b/mplayer.c
index fc87cca68a..20f5a433e7 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -434,6 +434,7 @@ char *sub_name=NULL;
 float sub_delay=0;
 float sub_fps=0;
 //int user_bpp=0;
+extern int vo_dbpp;
 #include "cfg-mplayer.h"
 
   printf("%s",banner_text);
@@ -862,13 +863,13 @@ printf("Found video codec: [%s] drv:%d (%s)\n",sh_video->codec->name,sh_video->c
 
 for(i=0;i<CODECS_MAX_OUTFMT;i++){
     out_fmt=sh_video->codec->outfmt[i];
-//    if(user_bpp){
-//        if( ((out_fmt & IMGFMT_BGR_MASK) == IMGFMT_BGR) && ((out_fmt & 0xff) == user_bpp) || (out_fmt & IMGFMT_BGR_MASK) != IMGFMT_BGR){
-//	     if(video_out->query_format(out_fmt)) break;
-//	}
-//    }else{
+    if(vo_dbpp){
+        if( ((out_fmt & IMGFMT_BGR_MASK) == IMGFMT_BGR) && ((out_fmt & 0xff) == vo_dbpp) || (out_fmt & IMGFMT_BGR_MASK) != IMGFMT_BGR){
+	     if(video_out->query_format(out_fmt)) break;
+	}
+    }else{
   	  if(video_out->query_format(out_fmt)) break;
-//    }
+    }
 }
 if(i>=CODECS_MAX_OUTFMT){
     printf("Sorry, selected video_out device is incompatible with this codec.\n");