diff options
| author | Andy Wingo <wingo@pobox.com> | 2001-12-23 06:56:55 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2001-12-23 06:56:55 +0000 |
| commit | 9161ba1c22b8ac35faf76f34d84f34e16c51ef84 (patch) | |
| tree | 5bcbe90884ac119d63d59d1f45d32e5f174047f0 | |
| parent | 789be9a726efbdffd802c1b770b76148460e6220 (diff) | |
| download | gst-plugins-bad-9161ba1c22b8ac35faf76f34d84f34e16c51ef84.tar.gz gst-plugins-bad-9161ba1c22b8ac35faf76f34d84f34e16c51ef84.tar.bz2 gst-plugins-bad-9161ba1c22b8ac35faf76f34d84f34e16c51ef84.zip | |
some changes, can't remember what :-)
Original commit message from CVS:
some changes, can't remember what :-)
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | ext/Makefile.am | 10 | ||||
| -rw-r--r-- | gst/mpegaudioparse/gstmpegaudioparse.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c037fbb8..ba6888c3 100644 --- a/configure.ac +++ b/configure.ac @@ -1097,6 +1097,7 @@ ext/audiofile/Makefile ext/esd/Makefile ext/lame/Makefile ext/mad/Makefile +ext/mpeg2dec/Makefile ext/sdl/Makefile ext/vorbis/Makefile gst-libs/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 0edd708f..b610baad 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -40,6 +40,12 @@ else MAD_DIR= endif +if USE_MPEG2DEC +MPEG2DEC_DIR=mad +else +MPEG2DEC_DIR= +endif + if USE_SDL SDL_DIR=sdl else @@ -54,8 +60,8 @@ endif #$A52_DIR SUBDIRS=$(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \ - $(LAME_DIR) $(MAD_DIR) \ + $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \ $(SDL_DIR) $(VORBIS_DIR) #a52 -DIST_SUBDIRS=aalib alsa audiofile esd lame mad sdl vorbis +DIST_SUBDIRS=aalib alsa audiofile esd lame mad mpeg2dec sdl vorbis diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index b1431c73..9b685209 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -95,7 +95,7 @@ static GstElementClass *parent_class = NULL; //static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; GType -mp3parse_get_type(void) { +gst_mp3parse_get_type(void) { static GType mp3parse_type = 0; if (!mp3parse_type) { |