remove/move some unused headers/variables/code

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

libvo/gl_common.c

@@ -38,8 +38,6 @@ void glAdjustAlignment(int stride) {
   glPixelStorei (GL_UNPACK_ALIGNMENT, gl_alignment);
 }
 
-#include "img_format.h"
-
 struct gl_name_map_struct {
   GLint value;
   char *name;

libvo/vo_gl.c

@@ -1,19 +1,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <errno.h>
 
-#include "mp_msg.h"
 #include "config.h"
+#include "mp_msg.h"
 #include "subopt-helper.h"
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "font_load.h"
 #include "sub.h"
 
-#include <errno.h>
-
 #include "gl_common.h"
 #include "aspect.h"
 #ifdef HAVE_NEW_GUI
@@ -204,8 +200,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
     return -1;
 #else
   if (WinID >= 0) {
-    Window win_tmp;
-    int int_tmp;
     vo_window = WinID ? (Window)WinID : mRootWin;
     goto glconfig;
   }
@@ -304,7 +298,6 @@ static void create_osd_texture(int x0, int y0, int w, int h,
                                  unsigned char *src, unsigned char *srca,
                                  int stride)
 {
-  int i;
   // initialize to 8 to avoid special-casing on alignment
   int sx = 8, sy = 8;
   GLint scale_type = (scaled_osd) ? GL_LINEAR : GL_NEAREST;
@@ -327,6 +320,7 @@ static void create_osd_texture(int x0, int y0, int w, int h,
   BindTexture(gl_target, osdatex[osdtexCnt]);
   glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 0);
   {
+  int i;
   char *tmp = (char *)malloc(stride * h);
   for (i = 0; i < h * stride; i++)
     tmp[i] = ~(-srca[i]);
@@ -358,10 +352,10 @@ static void create_osd_texture(int x0, int y0, int w, int h,
 
 static void draw_osd(void)
 {
-  int i;
-  int osd_h, osd_w;
   if (!use_osd) return;
   if (vo_osd_changed(0)) {
+    int i;
+    int osd_h, osd_w;
     for (i = 0; i < osdtexCnt; i++) {
       glDeleteTextures(1, &osdtex[i]);
 #ifndef FAST_OSD

libvo/vo_gl2.c

@@ -7,8 +7,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <errno.h>
 
 #include "config.h"
 #include "mp_msg.h"
@@ -20,8 +18,6 @@
 #include "Gui/interface.h"
 #endif
 
-#include <errno.h>
-
 #include "gl_common.h"
 #include "aspect.h"
 
@@ -46,11 +42,6 @@ LIBVO_EXTERN(gl2)
 /* local data */
 static unsigned char *ImageData=NULL;
 
-/* X11 related variables */
-//static Window vo_window;
-
-//static int texture_id=1;
-
 #ifdef GL_WIN32
     static int gl_vinfo = 0;
     static HGLRC gl_context = 0;
@@ -150,7 +141,7 @@ static int initTextures()
 {
   struct TexSquare *tsq=0;
   GLfloat texpercx, texpercy;
-  int s, i=0;
+  int s;
   int x=0, y=0;
   GLint format=0;
   GLenum err;
@@ -467,12 +458,14 @@ static void drawTextureDisplay ()
 		mp_msg (MSGT_VO, MSGL_V, "GLERROR glBindTexture := GL_INVALID_OPERATION, texnum x=%d, y=%d, texture=%d\n", x, y, square->texobj);
 	      }
 
+#ifndef NDEBUG
       if(glIsTexture(square->texobj) == GL_FALSE)
       {
         square->isTexture=GL_FALSE;
 	mp_msg (MSGT_VO, MSGL_ERR, "GLERROR ain't a texture(update): texnum x=%d, y=%d, texture=%d\n",
 		x, y, square->texobj);
       }
+#endif
 
       if(square->isDirty)
       {
@@ -970,7 +963,7 @@ static int preinit(const char *arg)
     if(arg) 
     {
 	mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] Unknown subdevice: %s\n",arg);
-	return ENOSYS;
+	return -1;
     }
     if( !vo_init() ) return -1; // Can't open X11
     return 0;