Mercurial > mplayer.hg

changeset 391:15fb291915fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- changed -bpp again: if vo driver obeys depth value set by user, then the codec should do the same ...
author acki2
date Fri, 13 Apr 2001 17:50:13 +0000
parents e77b47a99986
children 50214d6c1826
files mplayer.c
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Fri Apr 13 17:34:18 2001 +0000
+++ b/mplayer.c	Fri Apr 13 17:50:13 2001 +0000
@@ -434,6 +434,7 @@
 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 @@
 
 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");