diff options
| author | David Schleef <ds@schleef.org> | 2003-12-22 01:58:20 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-22 01:58:20 +0000 |
| commit | 6150b0200199d56868ce38f38766add2bed78ea2 (patch) | |
| tree | 53a41c896b558a4ec5388d7c613fa7e65b1c52c7 | |
| parent | 8c9cd079d4f9a516ca52b2c44432ab8f3b19ec71 (diff) | |
rename gstcaps2.[ch] to gstcaps.[ch]
Original commit message from CVS:
rename gstcaps2.[ch] to gstcaps.[ch]
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | gst/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/gst.h | 2 | ||||
| -rw-r--r-- | gst/gstcaps.c (renamed from gst/gstcaps2.c) | 0 | ||||
| -rw-r--r-- | gst/gstcaps.h (renamed from gst/gstcaps2.h) | 0 | ||||
| -rw-r--r-- | gst/gstpad.h | 2 | ||||
| -rw-r--r-- | gst/gsttypefind.h | 2 | ||||
| -rw-r--r-- | gst/gstvalue.h | 2 |
8 files changed, 19 insertions, 6 deletions
@@ -1,3 +1,16 @@ +2003-12-21 David Schleef <ds@schleef.org> + + * many, many files: Merge CAPS branch. This includes: + - implemention of GstValue and several GstValue types + - implemention of GstStructure + - entire rewrite of GstCaps + - removal of GstProps + - many changes to GstPad to compensate for new caps paradigm + - removal of GstBufferpool + * gst/Makefile.am, gst/gst.h, gst/gstpad.h, gst/gsttypefind.h, + gstvalue.h, gst/gstcaps[2]*.[ch]: + - rename gstcaps2.[ch] to gstcaps.[ch] + 2003-12-21 Ronald Bultje <rbultje@ronald.bitfreak.net> * gst/gstqueue.c: (gst_queue_handle_pending_events), diff --git a/gst/Makefile.am b/gst/Makefile.am index 3e162421f..5284d95db 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -80,7 +80,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \ gstatomic.c \ gstbin.c \ gstbuffer.c \ - gstcaps2.c \ + gstcaps.c \ gstclock.c \ gstcpu.c \ gstdata.c \ @@ -141,7 +141,7 @@ gst_headers = \ gstobject.h \ gstbin.h \ gstbuffer.h \ - gstcaps2.h \ + gstcaps.h \ gstclock.h \ gstcompat.h \ gstcpu.h \ @@ -33,7 +33,7 @@ #include <gst/gstbin.h> #include <gst/gstbuffer.h> -#include <gst/gstcaps2.h> +#include <gst/gstcaps.h> #include <gst/gstclock.h> #include <gst/gstcpu.h> #include <gst/gstelement.h> diff --git a/gst/gstcaps2.c b/gst/gstcaps.c index 66e0eb9ec..66e0eb9ec 100644 --- a/gst/gstcaps2.c +++ b/gst/gstcaps.c diff --git a/gst/gstcaps2.h b/gst/gstcaps.h index eb3a75c72..eb3a75c72 100644 --- a/gst/gstcaps2.h +++ b/gst/gstcaps.h diff --git a/gst/gstpad.h b/gst/gstpad.h index 85a210deb..ee6bd9d4d 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -28,7 +28,7 @@ #include <gst/gstobject.h> #include <gst/gstbuffer.h> -#include <gst/gstcaps2.h> +#include <gst/gstcaps.h> #include <gst/gstevent.h> #include <gst/gstprobe.h> #include <gst/gstquery.h> diff --git a/gst/gsttypefind.h b/gst/gsttypefind.h index 2c2717808..77f7dc7e7 100644 --- a/gst/gsttypefind.h +++ b/gst/gsttypefind.h @@ -24,7 +24,7 @@ #define __GST_TYPE_FIND_H__ #include <gst/gstbuffer.h> -#include <gst/gstcaps2.h> +#include <gst/gstcaps.h> #include <gst/gstplugin.h> #include <gst/gstpluginfeature.h> #include <gst/gsttypes.h> diff --git a/gst/gstvalue.h b/gst/gstvalue.h index 6c19291d7..cb2345483 100644 --- a/gst/gstvalue.h +++ b/gst/gstvalue.h @@ -21,7 +21,7 @@ #define __GST_VALUE_H__ #include <gst/gstconfig.h> -#include <gst/gstcaps2.h> +#include <gst/gstcaps.h> G_BEGIN_DECLS |