Mercurial > mplayer.hg

changeset 18996:49f158e94fce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vo_gl can do flipping without special filter
author reimar
date Mon, 10 Jul 2006 18:36:50 +0000
parents 46bf025408c3
children 73b8f5ff772d
files libvo/vo_gl.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl.c	Mon Jul 10 18:35:29 2006 +0000
+++ b/libvo/vo_gl.c	Mon Jul 10 18:36:50 2006 +0000
@@ -98,6 +98,7 @@
 static int texture_width;
 static int texture_height;
 static int mpi_flipped;
+static int vo_flipped;
 
 static unsigned int slice_height = 1;
 
@@ -317,6 +318,7 @@
 	glFindFormat(format, NULL, &gl_texfmt, &gl_format, &gl_type);
 
 	int_pause = 0;
+	vo_flipped = !!(flags & VOFLAG_FLIPPING);
 
 	panscan_init();
 	aspect_save_orig(width,height);
@@ -525,7 +527,8 @@
   glDrawTex(0, 0, image_width, image_height,
             0, 0, image_width, image_height,
             texture_width, texture_height,
-            use_rectangle == 1, image_format == IMGFMT_YV12, mpi_flipped);
+            use_rectangle == 1, image_format == IMGFMT_YV12,
+            mpi_flipped ^ vo_flipped);
   if (image_format == IMGFMT_YV12)
     glDisableYUVConversion(gl_target, yuvconvtype);
 
@@ -668,6 +671,7 @@
 query_format(uint32_t format)
 {
     int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW |
+               VFCAP_FLIP |
                VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
     if (use_osd)
       caps |= VFCAP_OSD;