mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

amrnb, amrwb: unconditionally depend on opencore-amr*b >= 0.1.3

Browse source 
We don't really need to cater for older versions any more.
This commit is contained in:
Tim-Philipp Müller 2016-01-25 20:00:26 +00:00
parent e9a04cd153
commit 11904d63be
4 changed files with 2 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
configure.ac
View file

@ -277,31 +277,13 @@ AG_GST_CHECK_FEATURE(A52DEC, [a52dec], a52dec, [
dnl *** amr-nb *** dnl *** amr-nb ***
translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true) translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true)
AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [ AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
PKG_CHECK_MODULES(AMRNB, opencore-amrnb, [ AG_GST_PKG_CHECK_MODULES(AMRNB, opencore-amrnb >= 0.1.3)
if $PKG_CONFIG --atleast-version=0.1.3 opencore-amrnb; then
AC_DEFINE(HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER, 1, [Defined for newer opencore-amrnb])
fi
HAVE_AMRNB="yes"
], [
HAVE_AMRNB="no"
])
AC_SUBST(AMRNB_CFLAGS)
AC_SUBST(AMRNB_LIBS)
]) ])
dnl *** amr-wb dec *** dnl *** amr-wb dec ***
translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true) translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbdec, [ AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbdec, [
PKG_CHECK_MODULES(AMRWB, opencore-amrwb, [ AG_GST_PKG_CHECK_MODULES(AMRWB, opencore-amrwb >= 0.1.3)
if $PKG_CONFIG --atleast-version=0.1.3 opencore-amrwb; then
AC_DEFINE(HAVE_OPENCORE_AMRWB_0_1_3_OR_LATER, 1, [Defined for newer opencore-amrwb])
fi
HAVE_AMRWB="yes"
], [
HAVE_AMRWB="no"
])
AC_SUBST(AMRWB_CFLAGS)
AC_SUBST(AMRWB_LIBS)
]) ])
dnl *** cdio *** dnl *** cdio ***

4
ext/amrnb/amrnbdec.h
View file

@ -23,11 +23,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/gstaudiodecoder.h> #include <gst/audio/gstaudiodecoder.h>
#ifdef HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER
#include <opencore-amrnb/interf_dec.h> #include <opencore-amrnb/interf_dec.h>
#else
#include <interf_dec.h>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS

4
ext/amrnb/amrnbenc.h
View file

@ -23,11 +23,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/gstaudioencoder.h> #include <gst/audio/gstaudioencoder.h>
#ifdef HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER
#include <opencore-amrnb/interf_enc.h> #include <opencore-amrnb/interf_enc.h>
#else
#include <interf_enc.h>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS

5
ext/amrwbdec/amrwbdec.h
View file

@ -23,13 +23,8 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/gstaudiodecoder.h> #include <gst/audio/gstaudiodecoder.h>
#ifdef HAVE_OPENCORE_AMRWB_0_1_3_OR_LATER
#include <opencore-amrwb/dec_if.h> #include <opencore-amrwb/dec_if.h>
#include <opencore-amrwb/if_rom.h> #include <opencore-amrwb/if_rom.h>
#else
#include <dec_if.h>
#include <if_rom.h>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS