diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ext/speex/gstspeexdec.h | 8 | ||||
| -rw-r--r-- | ext/speex/gstspeexenc.c | 4 | ||||
| -rw-r--r-- | ext/speex/gstspeexenc.h | 4 |
4 files changed, 20 insertions, 8 deletions
@@ -1,3 +1,14 @@ +2004-10-04 Iain <iaingnome@gmail.com> + + * ext/speex/gstspeexdec.h: Revert the includes changes. + + * ext/speex/gstspeexenc.[ch]: Revert the includes changes. + +2004-09-30 Iain <iaingnome@gmail.com> + + * sys/sunaudio/gstsunaudio.c (gst_sunaudiosink_open): Use the device + found during init or set as a property instead of hardcoding /dev/audio + 2004-10-04 Ronald S. Bultje <rbultje@ronald.bitfreak.net> * gst/realmedia/rmdemux.c: (gst_rmdemux_class_init), @@ -197,6 +208,7 @@ correct sink template even if it is not the one defined in this file. +>>>>>>> 1.1112 2004-09-29 Wim Taymans <wim@fluendo.com> * gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_packet), diff --git a/ext/speex/gstspeexdec.h b/ext/speex/gstspeexdec.h index 3dc99032..dcb04a2c 100644 --- a/ext/speex/gstspeexdec.h +++ b/ext/speex/gstspeexdec.h @@ -23,10 +23,10 @@ #include <gst/gst.h> -#include <speex.h> -#include <speex_callbacks.h> -#include <speex_header.h> -#include <speex_stereo.h> +#include <speex/speex.h> +#include <speex/speex_callbacks.h> +#include <speex/speex_header.h> +#include <speex/speex_stereo.h> #ifdef __cplusplus extern "C" { diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index 75b4924f..adf1cd80 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -25,8 +25,8 @@ #include <string.h> #include <time.h> #include <math.h> -#include <speex.h> -#include <speex_stereo.h> +#include <speex/speex.h> +#include <speex/speex_stereo.h> #include <gst/gsttaginterface.h> #include <gst/tag/tag.h> diff --git a/ext/speex/gstspeexenc.h b/ext/speex/gstspeexenc.h index a8a83805..dc1983b6 100644 --- a/ext/speex/gstspeexenc.h +++ b/ext/speex/gstspeexenc.h @@ -25,8 +25,8 @@ #include <gst/gst.h> #include <gst/bytestream/adapter.h> -#include <speex.h> -#include <speex_header.h> +#include <speex/speex.h> +#include <speex/speex_header.h> #ifdef __cplusplus extern "C" { |