mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 15:45:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

vorbis: Rename vorbis*.h to gstvorbis*.h to prevent name conflicts

Browse source
This commit is contained in:
Sebastian Dröge 2009-02-24 14:36:39 +01:00
parent 77a56d5975
commit dc9a1b945b
11 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/plugins/Makefile.am
View file

@ -94,10 +94,10 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/theora/gsttheoradec.h \ $(top_srcdir)/ext/theora/gsttheoradec.h \
$(top_srcdir)/ext/theora/gsttheoraenc.h \ $(top_srcdir)/ext/theora/gsttheoraenc.h \
$(top_srcdir)/ext/theora/gsttheoraparse.h \ $(top_srcdir)/ext/theora/gsttheoraparse.h \
$(top_srcdir)/ext/vorbis/vorbisdec.h \ $(top_srcdir)/ext/vorbis/gstvorbisdec.h \
$(top_srcdir)/ext/vorbis/vorbisenc.h \ $(top_srcdir)/ext/vorbis/gstvorbisenc.h \
$(top_srcdir)/ext/vorbis/vorbisparse.h \ $(top_srcdir)/ext/vorbis/gstvorbisparse.h \
$(top_srcdir)/ext/vorbis/vorbistag.h \ $(top_srcdir)/ext/vorbis/gstvorbistag.h \
$(top_srcdir)/gst/adder/gstadder.h \ $(top_srcdir)/gst/adder/gstadder.h \
$(top_srcdir)/gst/audioconvert/audioconvert.h \ $(top_srcdir)/gst/audioconvert/audioconvert.h \
$(top_srcdir)/gst/audioconvert/gstaudioconvert.h \ $(top_srcdir)/gst/audioconvert/gstaudioconvert.h \

2
ext/vorbis/Makefile.am
View file

@ -13,4 +13,4 @@ libgstvorbis_la_LIBADD = \
libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstvorbis_la_LIBTOOLFLAGS = --tag=disable-static libgstvorbis_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = vorbisenc.h vorbisdec.h vorbisparse.h vorbistag.h noinst_HEADERS = gstvorbisenc.h gstvorbisdec.h gstvorbisparse.h gstvorbistag.h

0
ext/vorbis/vorbisdec.h → ext/vorbis/gstvorbisdec.h
View file

0
ext/vorbis/vorbisenc.h → ext/vorbis/gstvorbisenc.h
View file

0
ext/vorbis/vorbisparse.h → ext/vorbis/gstvorbisparse.h
View file

2
ext/vorbis/vorbistag.h → ext/vorbis/gstvorbistag.h
View file

@ -22,7 +22,7 @@
#ifndef __GST_VORBIS_TAG_H__ #ifndef __GST_VORBIS_TAG_H__
#define __GST_VORBIS_TAG_H__ #define __GST_VORBIS_TAG_H__
#include "vorbisparse.h" #include "gstvorbisparse.h"
G_BEGIN_DECLS G_BEGIN_DECLS

8
ext/vorbis/vorbis.c
View file

@ -23,10 +23,10 @@
#include "gst/tag/tag.h" #include "gst/tag/tag.h"
#include "vorbisenc.h" #include "gstvorbisenc.h"
#include "vorbisdec.h" #include "gstvorbisdec.h"
#include "vorbisparse.h" #include "gstvorbisparse.h"
#include "vorbistag.h" #include "gstvorbistag.h"
GST_DEBUG_CATEGORY (vorbisenc_debug); GST_DEBUG_CATEGORY (vorbisenc_debug);
GST_DEBUG_CATEGORY (vorbisdec_debug); GST_DEBUG_CATEGORY (vorbisdec_debug);

2
ext/vorbis/vorbisdec.c
View file

@ -40,7 +40,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include "vorbisdec.h" #include "gstvorbisdec.h"
#include <string.h> #include <string.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/tag/tag.h> #include <gst/tag/tag.h>

4
ext/vorbis/vorbisenc.c
View file

@ -39,10 +39,10 @@
* *
* Last reviewed on 2006-03-01 (0.10.4) * Last reviewed on 2006-03-01 (0.10.4)
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
@ -51,7 +51,7 @@
#include <gst/gsttagsetter.h> #include <gst/gsttagsetter.h>
#include <gst/tag/tag.h> #include <gst/tag/tag.h>
#include <gst/audio/multichannel.h> #include <gst/audio/multichannel.h>
#include "vorbisenc.h" #include "gstvorbisenc.h"
GST_DEBUG_CATEGORY_EXTERN (vorbisenc_debug); GST_DEBUG_CATEGORY_EXTERN (vorbisenc_debug);
#define GST_CAT_DEFAULT vorbisenc_debug #define GST_CAT_DEFAULT vorbisenc_debug

2
ext/vorbis/vorbisparse.c
View file

@ -53,7 +53,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include "vorbisparse.h" #include "gstvorbisparse.h"
GST_DEBUG_CATEGORY_EXTERN (vorbisparse_debug); GST_DEBUG_CATEGORY_EXTERN (vorbisparse_debug);
#define GST_CAT_DEFAULT vorbisparse_debug #define GST_CAT_DEFAULT vorbisparse_debug

2
ext/vorbis/vorbistag.c
View file

@ -54,7 +54,7 @@
#include <vorbis/codec.h> #include <vorbis/codec.h>
#include "vorbistag.h" #include "gstvorbistag.h"
GST_DEBUG_CATEGORY_EXTERN (vorbisparse_debug); GST_DEBUG_CATEGORY_EXTERN (vorbisparse_debug);