[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/03 21:50:34

Modified files:
        .              : ChangeLog 
        backend        : render_handler_ogl.cpp 

Log message:
        Removed unused #include <>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1499&r2=1.1500
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1499
retrieving revision 1.1500
diff -u -b -r1.1499 -r1.1500
--- ChangeLog   3 Nov 2006 17:46:45 -0000       1.1499
+++ ChangeLog   3 Nov 2006 21:50:34 -0000       1.1500
@@ -24,6 +24,7 @@
 
        * server/asobj/Math.cpp, server/as_value.h: Added #include <string>.
        * server/asobj/NetStream.h: #ifdef USE_FFMPEG.
+       * backend/render_handler_ogg.h: Removed unused include...
 
 2006-11-03 Vitaly Alexeev <address@hidden>
 

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- backend/render_handler_ogl.cpp      3 Nov 2006 21:28:52 -0000       1.47
+++ backend/render_handler_ogl.cpp      3 Nov 2006 21:50:34 -0000       1.48
@@ -6,7 +6,7 @@
 // A render_handler that uses SDL & OpenGL
 
 
-/* $Id: render_handler_ogl.cpp,v 1.47 2006/11/03 21:28:52 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.48 2006/11/03 21:50:34 nihilus Exp $ */
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -23,10 +23,6 @@
 #      include <Windows.h>
 #endif
 
-#ifdef USE_FFMPEG
-#include <ffmpeg/avformat.h>
-#endif
-
 using namespace gnash;
 
 // choose the resampling method:
@@ -701,7 +697,7 @@
 
                            glActiveTextureARB(GL_TEXTURE1_ARB);
                            glEnable(GL_TEXTURE_2D);
-                           glGenTextures(1, &s_edge_texture_id);
+                           glGenTextures(1, (GLuint*)&s_edge_texture_id);
                            glBindTexture(GL_TEXTURE_2D, s_edge_texture_id);
 
                            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 
GL_CLAMP_TO_EDGE);