diff --git a/configure.ac b/configure.ac index 3ebe17d39e..99d8e14a57 100644 --- a/configure.ac +++ b/configure.ac @@ -166,7 +166,7 @@ GST_PLUGIN_LDFLAGS='-module -avoid-version' AC_SUBST(GST_PLUGIN_LDFLAGS) GST_PLUGINS_ALL="\ - ac3parse adder audioscale auparse avi chart\ + ac3parse adder audioscale auparse avi cdxaparse chart\ cutter deinterlace flx goom intfloat law level\ median mpeg1enc mpeg1sys mpeg1videoparse mpeg2enc mpeg2sub\ mpegaudio mpegaudioparse mpegstream mpegtypes modplug\ @@ -744,6 +744,7 @@ gst/adder/Makefile gst/audioscale/Makefile gst/auparse/Makefile gst/avi/Makefile +gst/cdxaparse/Makefile gst/chart/Makefile gst/cutter/Makefile gst/deinterlace/Makefile diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c index b7bed263ea..7daf7a5d79 100644 --- a/ext/a52dec/gsta52dec.c +++ b/ext/a52dec/gsta52dec.c @@ -29,7 +29,7 @@ /* elementfactory information */ static GstElementDetails gst_a52dec_details = { "ATSC A/52 audio decoder", - "Filter/Decoder/Audio", + "Codec/Audio/Decoder", "Decodes ATSC A/52 encoded audio streams", VERSION, "David I. Lehn ", diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c index aab672afc7..4fa740f124 100644 --- a/ext/mad/gstmad.c +++ b/ext/mad/gstmad.c @@ -76,7 +76,7 @@ struct _GstMadClass { /* elementfactory information */ static GstElementDetails gst_mad_details = { "mad mp3 decoder", - "Filter/Decoder/Audio", + "Codec/Audio/Decoder", "Uses mad code to decode mp3 streams", VERSION, "Wim Taymans ", diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c index 24693a6ae3..3f07a24897 100644 --- a/ext/mpeg2dec/gstmpeg2dec.c +++ b/ext/mpeg2dec/gstmpeg2dec.c @@ -28,7 +28,7 @@ /* elementfactory information */ static GstElementDetails gst_mpeg2dec_details = { "mpeg1 and mpeg2 video decoder", - "Filter/Decoder/Video", + "Codec/Video/Decoder", "Uses libmpeg2 to decode MPEG video streams", VERSION, "David I. Lehn ", diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index 488e03fffc..7516d5f8d9 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -25,7 +25,7 @@ /* elementfactory information */ static GstElementDetails gst_siddec_details = { "Sid decoder", - "Filter/Decoder/Audio", + "Codec/Audio/Decoder", "Use sidplay to decode SID audio tunes", VERSION, "Wim Taymans ", diff --git a/gst/ac3parse/gstac3parse.c b/gst/ac3parse/gstac3parse.c index 8a73263763..1963a36291 100644 --- a/gst/ac3parse/gstac3parse.c +++ b/gst/ac3parse/gstac3parse.c @@ -72,7 +72,7 @@ static struct frmsize_s frmsizecod_tbl[] = { /* elementfactory information */ static GstElementDetails ac3parse_details = { "AC3 Parser", - "Filter/Parser/Audio", + "Codec/Parser", "Parses and frames AC3 audio streams, provides seek", VERSION, "Erik Walthinsen ", diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index 151aec0c7c..177a5d3d94 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -23,9 +23,9 @@ /* elementfactory information */ static GstElementDetails mp3parse_details = { - "MP3 Parser", - "Filter/Parser/Audio", - "Parses and frames MP3 audio streams, provides seek", + "MPEG1 Audio Parser", + "Codec/Parser", + "Parses and frames mpeg1 audio streams (levels 1-3), provides seek", VERSION, "Erik Walthinsen ", "(C) 1999", diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c index 1de2ab42bb..9fc7d3fca1 100644 --- a/gst/mpegstream/gstmpegdemux.c +++ b/gst/mpegstream/gstmpegdemux.c @@ -23,8 +23,8 @@ /* elementfactory information */ static GstElementDetails mpeg_demux_details = { - "MPEG System Parser", - "Filter/Parser/System", + "MPEG Demuxer", + "Codec/Demuxer", "Demultiplexes MPEG1 and MPEG2 System Streams", VERSION, "Erik Walthinsen \n" diff --git a/gst/mpegstream/gstmpegparse.c b/gst/mpegstream/gstmpegparse.c index 7b1de5c07c..a45238a78b 100644 --- a/gst/mpegstream/gstmpegparse.c +++ b/gst/mpegstream/gstmpegparse.c @@ -24,8 +24,8 @@ /* elementfactory information */ static GstElementDetails mpeg_parse_details = { "MPEG System Parser", - "Filter/Parser/System", - "Demultiplexes MPEG1 and MPEG2 System Streams", + "Codec/Parser", + "Parses MPEG1 and MPEG2 System Streams", VERSION, "Erik Walthinsen \n" "Wim Taymans ", diff --git a/gst/mpegstream/gstrfc2250enc.c b/gst/mpegstream/gstrfc2250enc.c index 9e1fc387fa..843891b0ab 100644 --- a/gst/mpegstream/gstrfc2250enc.c +++ b/gst/mpegstream/gstrfc2250enc.c @@ -24,7 +24,7 @@ /* elementfactory information */ static GstElementDetails rfc2250_enc_details = { "RFC 2250 packet encoder", - "Filter/Parser/System", + "Codec/Parser", "transforms MPEG1/2 video to an RFC 2250 compliant format", VERSION, "Wim Taymans ", diff --git a/gst/synaesthesia/gstsynaesthesia.c b/gst/synaesthesia/gstsynaesthesia.c index dc65e262c9..9a0cf7535a 100644 --- a/gst/synaesthesia/gstsynaesthesia.c +++ b/gst/synaesthesia/gstsynaesthesia.c @@ -59,7 +59,7 @@ GType gst_synaesthesia_get_type(void); /* elementfactory information */ static GstElementDetails gst_synaesthesia_details = { "Synaesthesia", - "Filter/Visualization", + "Visualization", "Creates video visualizations of audio input, using stereo and pitch information", VERSION, "Richard Boulton ", diff --git a/m4/mpeg2dec.m4 b/m4/mpeg2dec.m4 index 5b72fefd16..47422cd9c1 100644 --- a/m4/mpeg2dec.m4 +++ b/m4/mpeg2dec.m4 @@ -57,12 +57,12 @@ AC_ARG_WITH(mpeg2dec-prefix, if test x$mpeg2dec_config_prefix = x ; then MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, - MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel") + MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel",, -lcpuaccel) else MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, [ MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel -L$mpeg2dec_config_prefix/lib" MPEG2DEC_CFLAGS="-I$mpeg2dec_config_prefix/include" - ], , -L$mpeg2dec_config_prefix/lib, -I$mpeg2dec_config_prefix/include) + ], , -L$mpeg2dec_config_prefix/lib -lcpuaccel, -I$mpeg2dec_config_prefix/include) fi if test "x$HAVE_MPEG2DEC" = "xyes"; then