diff options
| author | jep <jep@2b0047a9-a6d8-0310-accf-f7200b2a168c> | 2012-05-07 10:44:17 +0000 |
|---|---|---|
| committer | jep <jep@2b0047a9-a6d8-0310-accf-f7200b2a168c> | 2012-05-07 10:44:17 +0000 |
| commit | 11d13233f62518a5516c6e4a49ba89d021ce5351 (patch) | |
| tree | a89c87cbf3555c808aaeab8075393218404aa110 /src | |
| parent | 58db9fab10e3df2569255e1e2f9fe085414fdf31 (diff) | |
* src/Makefile.am:
* src/bitstream.h:
* src/common.h:
* src/flump3dec.c:
* src/flump3dec.h:
Fixes build with GStreamer prior to 0.10.18.
git-svn-id: https://core.fluendo.com/gstreamer/svn/trunk/gst-fluendo-mp3@2279 2b0047a9-a6d8-0310-accf-f7200b2a168c
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 39 | ||||
| -rw-r--r-- | src/bitstream.h | 1 | ||||
| -rw-r--r-- | src/common.h | 9 | ||||
| -rw-r--r-- | src/flump3dec.c | 17 | ||||
| -rw-r--r-- | src/flump3dec.h | 1 |
5 files changed, 23 insertions, 44 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3af02df..b0a5cdc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,33 +6,34 @@ SOURCE_FILES += mp3-ipp.c endif libgstflump3dec_la_SOURCES = \ - flump3dec.c \ - bitstream.c \ - common.c \ - decode.c \ - mp3tl.c \ + flump3dec.c \ + bitstream.c \ + common.c \ + decode.c \ + mp3tl.c \ $(SOURCE_FILES) noinst_HEADERS = \ - bitstream.h \ - common.h \ - decode.h \ - flump3dec.h \ - mp3tl.h \ - mp3tl-priv.h \ - table-bitalloc.h \ - table-dewindow.h \ + bitstream.h \ + common.h \ + gst_compat.h \ + decode.h \ + flump3dec.h \ + mp3tl.h \ + mp3tl-priv.h \ + table-bitalloc.h \ + table-dewindow.h \ table-dewindow-ipp.h \ - table-huffdec.h \ - mp3-cos-tables.h \ - mp3-c.h \ - mp3-ipp.h \ + table-huffdec.h \ + mp3-cos-tables.h \ + mp3-c.h \ + mp3-ipp.h \ table-powtable.h \ table-powtable-2.h libgstflump3dec_la_LIBADD = $(GST_LIBS) $(IPP_LIBS) $(LIBOIL_LIBS) -lm libgstflump3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(CPU_TUNE_LDFLAGS) libgstflump3dec_la_CFLAGS = \ - $(GST_ERROR) $(GST_CFLAGS) $(CPU_TUNE_CFLAGS) \ - $(IPP_INCLUDES) $(LIBOIL_CFLAGS) + $(GST_ERROR) $(GST_CFLAGS) $(CPU_TUNE_CFLAGS) \ + $(IPP_INCLUDES) $(LIBOIL_CFLAGS) libgstflump3dec_la_CCASFLAGS = $(CPU_TUNE_CCASFLAGS) diff --git a/src/bitstream.h b/src/bitstream.h index 5582e80..7afcb51 100644 --- a/src/bitstream.h +++ b/src/bitstream.h @@ -14,6 +14,7 @@ #include <glib.h> #include <gst/gst.h> +#include "gst_compat.h" /* Accumulator optimization on bitstream management */ #define ENABLE_OPT_BS 1 diff --git a/src/common.h b/src/common.h index f394bba..8236fcc 100644 --- a/src/common.h +++ b/src/common.h @@ -33,6 +33,7 @@ #include <string.h> #include <math.h> +#include "gst_compat.h" #include "bitstream.h" /*********************************************************************** @@ -41,14 +42,6 @@ * ***********************************************************************/ -#ifndef GST_CHECK_VERSION -#define GST_CHECK_VERSION(major,minor,micro) \ - (GST_VERSION_MAJOR > (major) || \ - (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR > (minor)) || \ - (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \ - GST_VERSION_MICRO >= (micro))) -#endif - #ifdef __GNUC__ #define ATTR_UNUSED __attribute__ ((unused)) #else diff --git a/src/flump3dec.c b/src/flump3dec.c index 519711f..7bbba79 100644 --- a/src/flump3dec.c +++ b/src/flump3dec.c @@ -14,23 +14,6 @@ GST_DEBUG_CATEGORY (flump3debug); #define GST_CAT_DEFAULT flump3debug -#ifndef GST_CHECK_VERSION -#define GST_CHECK_VERSION(major,minor,micro) \ - (GST_VERSION_MAJOR > (major) || \ - (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR > (minor)) || \ - (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \ - GST_VERSION_MICRO >= (micro))) -#endif - -#if !GST_CHECK_VERSION(0,10,14) -#define gst_element_class_set_details_simple(klass,longname,classification,description,author) \ - G_STMT_START{ \ - static GstElementDetails details = \ - GST_ELEMENT_DETAILS (longname,classification,description,author); \ - gst_element_class_set_details (element_class, &details); \ - }G_STMT_END -#endif - /* static vars */ static GstElementClass *parent_class = NULL; diff --git a/src/flump3dec.h b/src/flump3dec.h index d01a73d..e99aef1 100644 --- a/src/flump3dec.h +++ b/src/flump3dec.h @@ -7,6 +7,7 @@ #define __FLUMP3DEC_H__ #include <gst/gst.h> +#include "gst_compat.h" #include "mp3tl.h" G_BEGIN_DECLS |