diff options
| author | Mark Nauwelaerts <manauw@skynet.be> | 2008-03-05 06:03:03 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-03-05 06:03:03 +0000 |
| commit | acb81c58c547b0e6155fd61b7914f39deea428ad (patch) | |
| tree | 8427c825ea71f1fee1dbc46b37e4b9d35d6a14c8 /ext/Makefile.am | |
| parent | 646ac4cdf2054e5cd38c1869701a4e839f8436b2 (diff) | |
| download | gst-plugins-bad-acb81c58c547b0e6155fd61b7914f39deea428ad.tar.gz gst-plugins-bad-acb81c58c547b0e6155fd61b7914f39deea428ad.tar.bz2 gst-plugins-bad-acb81c58c547b0e6155fd61b7914f39deea428ad.zip | |
Port mplex element to 0.10. Fixes bug #520329.
Original commit message from CVS:
Patch by: Mark Nauwelaerts <manauw at skynet dot be>
* configure.ac:
* ext/Makefile.am:
* ext/mplex/Makefile.am:
* ext/mplex/gstmplex.cc:
* ext/mplex/gstmplex.hh:
* ext/mplex/gstmplexibitstream.cc:
* ext/mplex/gstmplexibitstream.hh:
* ext/mplex/gstmplexjob.cc:
* ext/mplex/gstmplexjob.hh:
* ext/mplex/gstmplexoutputstream.cc:
* ext/mplex/gstmplexoutputstream.hh:
Port mplex element to 0.10. Fixes bug #520329.
* tests/check/Makefile.am:
* tests/check/elements/mplex.c: (test_sink_event), (setup_src_pad),
(teardown_src_pad), (setup_mplex), (cleanup_mplex),
(GST_START_TEST), (mplex_suite), (main):
Add unit test for the mplex element.
Diffstat (limited to 'ext/Makefile.am')
| -rw-r--r-- | ext/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index ef399c58..af823448 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -154,11 +154,11 @@ else METADATA_DIR= endif -# if USE_MPLEX -# MPLEX_DIR=mplex -# else +if USE_MPLEX +MPLEX_DIR=mplex +else MPLEX_DIR= -# endif +endif if USE_MUSEPACK MUSEPACK_DIR=musepack @@ -355,6 +355,7 @@ DIST_SUBDIRS = \ divx \ metadata \ mpeg2enc \ + mplex \ musepack \ musicbrainz \ mythtv \ |