diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-11-07 18:30:06 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-11-07 18:30:06 +0000 |
| commit | 44fd8700290d4147f21a1384ddb6478a529361ee (patch) | |
| tree | e475849a39c419c60de31dad0db34995564cf68f | |
| parent | 7fa54d624d340459672624c1764835c01fcaddf4 (diff) | |
Add musepack decoder.
Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
* ext/musepack/Makefile.am:
* ext/musepack/gstmusepackdec.cpp:
* ext/musepack/gstmusepackdec.h:
* ext/musepack/gstmusepackreader.cpp:
* ext/musepack/gstmusepackreader.h:
Add musepack decoder.
* ext/faad/gstfaad.c: (gst_faad_base_init):
Make pad templates static.
* gst/typefind/gsttypefindfunctions.c: (mp3_type_find),
(plugin_init):
Add musepack typefinder, make mp3 typefinding work halfway stream,
which doesn't actually work yet because id3demux doesn't implement
_get_length().
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 |
3 files changed, 44 insertions, 0 deletions
@@ -1,5 +1,23 @@ 2004-11-07 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * configure.ac: + * ext/Makefile.am: + * ext/musepack/Makefile.am: + * ext/musepack/gstmusepackdec.cpp: + * ext/musepack/gstmusepackdec.h: + * ext/musepack/gstmusepackreader.cpp: + * ext/musepack/gstmusepackreader.h: + Add musepack decoder. + * ext/faad/gstfaad.c: (gst_faad_base_init): + Make pad templates static. + * gst/typefind/gsttypefindfunctions.c: (mp3_type_find), + (plugin_init): + Add musepack typefinder, make mp3 typefinding work halfway stream, + which doesn't actually work yet because id3demux doesn't implement + _get_length(). + +2004-11-07 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * ext/ogg/gstoggmux.c: (gst_ogg_mux_next_buffer), (gst_ogg_mux_queue_pads), (gst_ogg_mux_loop): Fix interrupt event handling (#144436). diff --git a/configure.ac b/configure.ac index 11b17ff0..a69a2bcd 100644 --- a/configure.ac +++ b/configure.ac @@ -1359,6 +1359,23 @@ main (int argc, fi ]) +dnl *** musepack *** +translit(dnm, m, l) AM_CONDITIONAL(USE_MUSEPACK, true) +GST_CHECK_FEATURE(MUSEPACK, [musepackdec], musepack, [ + AC_LANG_CPLUSPLUS + OLD_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-I/usr/include/musepack $CPPFLAGS" + AC_CHECK_HEADER(mpc_dec.h, [ + HAVE_MUSEPACK="yes" + MUSEPACK_LIBS="-lmusepack" + MUSEPACK_CFLAGS="-I/usr/include/musepack" + AC_SUBST(MUSEPACK_CFLAGS) + AC_SUBST(MUSEPACK_LIBS) + ], [HAVE_MUSEPACK="no"]) + CPPFLAGS="$OLD_CPPFLAGS" + AC_LANG_C +]) + dnl *** musicbrainz *** dnl libmusicbrainz <= 2.0.2 has symbol clashes with ffmpeg dnl however, our ffmpeg patch was accepted upstream @@ -1948,6 +1965,7 @@ ext/mikmod/Makefile ext/mpeg2dec/Makefile ext/mpeg2enc/Makefile ext/mplex/Makefile +ext/musepack/Makefile ext/musicbrainz/Makefile ext/nas/Makefile ext/ogg/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index cd9c5ac3..311a3209 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -238,6 +238,12 @@ endif #MAS_DIR= #endif +if USE_MUSEPACK +MUSEPACK_DIR=musepack +else +MUSEPACK_DIR= +endif + if USE_MUSICBRAINZ MUSICBRAINZ_DIR=musicbrainz else @@ -399,6 +405,7 @@ SUBDIRS=\ $(MPEG2DEC_DIR) \ $(MPEG2ENC_DIR) \ $(MPLEX_DIR) \ + $(MUSEPACK_DIR) \ $(MUSICBRAINZ_DIR) \ $(OGG_DIR) \ $(PANGO_DIR) \ @@ -458,6 +465,7 @@ DIST_SUBDIRS=\ mpeg2dec \ mpeg2enc \ mplex \ + musepack \ musicbrainz \ nas \ ogg \ |