summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--sys/glsink/Makefile.am4
-rw-r--r--sys/glsink/glimagesink.h2
-rw-r--r--sys/glsink/gstglbuffer.c2
-rw-r--r--sys/glsink/gstglbuffer.h3
-rw-r--r--sys/glsink/gstgldisplay.c (renamed from sys/glsink/glvideo.c)4
-rw-r--r--sys/glsink/gstgldisplay.h (renamed from sys/glsink/glvideo.h)0
7 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index bf5346e9..f7f4c61c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2007-12-24 David Schleef <ds@schleef.org>
+ * sys/glsink/Makefile.am:
+ * sys/glsink/glimagesink.h:
+ * sys/glsink/glvideo.c:
+ * sys/glsink/glvideo.h:
+ * sys/glsink/gstglbuffer.c:
+ * sys/glsink/gstglbuffer.h:
+ * sys/glsink/gstgldisplay.c:
+ * sys/glsink/gstgldisplay.h:
+ Rename glvideo.[ch] to gstgldisplay.[ch].
+
+2007-12-24 David Schleef <ds@schleef.org>
+
* sys/glsink/glimagesink.c:
* sys/glsink/glimagesink.h:
* sys/glsink/glvideo.c:
diff --git a/sys/glsink/Makefile.am b/sys/glsink/Makefile.am
index 49d8ac4f..ab1a6536 100644
--- a/sys/glsink/Makefile.am
+++ b/sys/glsink/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstglimagesink.la
libgstglimagesink_la_SOURCES = \
glimagesink.c \
- glvideo.c \
+ gstgldisplay.c \
gstopengl.c \
glextensions.c \
gstglbuffer.c \
@@ -19,6 +19,6 @@ libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
glimagesink.h \
- glvideo.h \
+ gstgldisplay.h \
glextensions.h \
gstglbuffer.h
diff --git a/sys/glsink/glimagesink.h b/sys/glsink/glimagesink.h
index ff60955b..3467c619 100644
--- a/sys/glsink/glimagesink.h
+++ b/sys/glsink/glimagesink.h
@@ -26,7 +26,7 @@
#include <gst/video/gstvideosink.h>
#include <gst/video/video.h>
-#include "glvideo.h"
+#include "gstgldisplay.h"
GST_DEBUG_CATEGORY_EXTERN (gst_debug_glimage_sink);
diff --git a/sys/glsink/gstglbuffer.c b/sys/glsink/gstglbuffer.c
index f85179bc..9285a7af 100644
--- a/sys/glsink/gstglbuffer.c
+++ b/sys/glsink/gstglbuffer.c
@@ -4,7 +4,7 @@
#endif
#include <gstglbuffer.h>
-#include <glvideo.h>
+#include <gstgldisplay.h>
#include <GL/glext.h>
#include <unistd.h>
#include "glextensions.h"
diff --git a/sys/glsink/gstglbuffer.h b/sys/glsink/gstglbuffer.h
index 3bb4437c..e24b70f0 100644
--- a/sys/glsink/gstglbuffer.h
+++ b/sys/glsink/gstglbuffer.h
@@ -4,8 +4,7 @@
#include <gst/gst.h>
#include <gst/video/video.h>
-#include <xcb/xcb.h>
-#include <glvideo.h>
+#include <gstgldisplay.h>
typedef struct _GstGLBuffer GstGLBuffer;
diff --git a/sys/glsink/glvideo.c b/sys/glsink/gstgldisplay.c
index b574a154..7b1c39b2 100644
--- a/sys/glsink/glvideo.c
+++ b/sys/glsink/gstgldisplay.c
@@ -1,4 +1,4 @@
-/* glvideo.c
+/* gstgldisplay.c
* Copyright (C) 2007 David A. Schleef <ds@schleef.org>
*
* This library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include "glvideo.h"
+#include "gstgldisplay.h"
#include "glextensions.h"
#include <gst/gst.h>
diff --git a/sys/glsink/glvideo.h b/sys/glsink/gstgldisplay.h
index 677c569f..677c569f 100644
--- a/sys/glsink/glvideo.h
+++ b/sys/glsink/gstgldisplay.h