diff --git a/configure.ac b/configure.ac index f9f6c18c02..aaab63ea5a 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file dnl initialize autoconf dnl releases only do -Wall, cvs and prerelease does -Werror too dnl use a three digit version number for releases, and four for cvs/prerelease -AC_INIT(GStreamer Ugly Plug-ins, 0.10.15.1, +AC_INIT(GStreamer Ugly Plug-ins, 0.10.15.2, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-plugins-ugly) diff --git a/docs/plugins/gst-plugins-ugly-plugins.args b/docs/plugins/gst-plugins-ugly-plugins.args index 5d1583fb78..2516199bef 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.args +++ b/docs/plugins/gst-plugins-ugly-plugins.args @@ -895,7 +895,7 @@ rw Motion Estimation Integer pixel motion estimation method. -hexagonal search, radius 2 +hex @@ -913,7 +913,7 @@ guint <= 100000 rw -Noise Reducation +Noise Reduction Noise reduction strength. 0 @@ -1004,7 +1004,7 @@ rw Stats File -Filename for multipass statistics (deprecated, use multipass-stats-file). +Filename for multipass statistics (deprecated, use multipass-cache-file). "x264.log" @@ -1025,7 +1025,7 @@ rw Threads Number of threads used by the codec (0 for automatic). -1 +0 @@ -1108,6 +1108,56 @@ -1 + +GstX264Enc::option-string +gchar* + +rw +Option string +String of x264 options (overridden by element properties). +"" + + + +GstX264Enc::profile +GstX264EncProfile + +rw +H.264 profile +Apply restrictions to meet H.264 Profile constraints. This will override other properties if necessary. +main + + + +GstX264Enc::psy-tune +GstX264EncPsyTune + +rw +Psychovisual tuning preset +Preset name for psychovisual tuning options. +No tuning + + + +GstX264Enc::speed-preset +GstX264EncPreset + +rw +Speed/quality preset +Preset name for speed/quality tradeoff options (can affect decode compatibility - impose restrictions separately for your target decoder). +medium + + + +GstX264Enc::tune +GstX264EncTune + +rw +Content tuning preset +Preset name for non-psychovisual tuning options. + + + GstMad::half gboolean diff --git a/docs/plugins/gst-plugins-ugly-plugins.hierarchy b/docs/plugins/gst-plugins-ugly-plugins.hierarchy index d0df8b36f7..af23127ae4 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.hierarchy +++ b/docs/plugins/gst-plugins-ugly-plugins.hierarchy @@ -1,60 +1,60 @@ GObject GstObject - GstPad - GstPadTemplate - GstPluginFeature - GstElementFactory - GstTypeFindFactory - GstIndexFactory + GstBus + GstClock GstElement - GstBin - GstPipeline - GstBaseSrc - GstPushSrc - GstDvdReadSrc - GstCddaBaseSrc - GstCdioCddaSrc - GstPNMSrc - GstMad - GstX264Enc - GstTwoLame - GstSidDec - GstLameMP3Enc - GstLame + AC3IEC GstA52Dec - GstAmrwbDec - GstMpeg2dec + GstASFDemux GstAmrnbDec GstAmrnbEnc + GstAmrwbDec + GstBaseRTPDepayload + GstRtpAsfDepay + GstBaseSrc + GstPushSrc + GstCddaBaseSrc + GstCdioCddaSrc + GstDvdReadSrc + GstPNMSrc + GstBin + GstPipeline + GstDvdLpcmDec GstDvdSubDec GstDvdSubParse - AC3IEC - GstDvdLpcmDec - GstXingMux + GstLame + GstLameMP3Enc GstMPEGAudioParse GstMPEGParse GstMPEGDemux GstDVDDemux - GstRMDemux - GstRealAudioDemux + GstMad + GstMpeg2dec GstRDTDepay GstRDTManager + GstRMDemux GstRTSPReal - GstASFDemux GstRTSPWMS - GstBaseRTPDepayload - GstRtpAsfDepay - GstBus + GstRealAudioDemux + GstSidDec + GstTwoLame + GstX264Enc + GstXingMux + GstPad + GstPadTemplate + GstPlugin + GstPluginFeature + GstElementFactory + GstIndexFactory + GstTypeFindFactory + GstRegistry GstTask GstTaskPool - GstClock - GstPlugin - GstRegistry GstSignalObject GInterface GTypePlugin GstChildProxy - GstURIHandler GstPreset - GstTagSetter GstRTSPExtension + GstTagSetter + GstURIHandler diff --git a/docs/plugins/inspect/plugin-a52dec.xml b/docs/plugins/inspect/plugin-a52dec.xml index 997f726220..dd4fe29192 100644 --- a/docs/plugins/inspect/plugin-a52dec.xml +++ b/docs/plugins/inspect/plugin-a52dec.xml @@ -3,10 +3,10 @@ Decodes ATSC A/52 encoded audio streams ../../ext/a52dec/.libs/libgsta52dec.so libgsta52dec.so - 0.10.15.1 + 0.10.15.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-amrnb.xml b/docs/plugins/inspect/plugin-amrnb.xml index 2dae4839fa..af1c891e18 100644 --- a/docs/plugins/inspect/plugin-amrnb.xml +++ b/docs/plugins/inspect/plugin-amrnb.xml @@ -3,10 +3,10 @@ Adaptive Multi-Rate Narrow-Band ../../ext/amrnb/.libs/libgstamrnb.so libgstamrnb.so - 0.10.15.1 + 0.10.15.2 unknown gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-amrwbdec.xml b/docs/plugins/inspect/plugin-amrwbdec.xml index 4b3de00765..5fc8a28537 100644 --- a/docs/plugins/inspect/plugin-amrwbdec.xml +++ b/docs/plugins/inspect/plugin-amrwbdec.xml @@ -3,10 +3,10 @@ Adaptive Multi-Rate Wide-Band Decoder ../../ext/amrwbdec/.libs/libgstamrwbdec.so libgstamrwbdec.so - 0.10.15.1 + 0.10.15.2 unknown gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-asf.xml b/docs/plugins/inspect/plugin-asf.xml index 9f2bc07e23..7aebe90336 100644 --- a/docs/plugins/inspect/plugin-asf.xml +++ b/docs/plugins/inspect/plugin-asf.xml @@ -3,10 +3,10 @@ Demuxes and muxes audio and video in Microsofts ASF format ../../gst/asfdemux/.libs/libgstasf.so libgstasf.so - 0.10.15.1 + 0.10.15.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-cdio.xml b/docs/plugins/inspect/plugin-cdio.xml index 0571ce2782..b332567bca 100644 --- a/docs/plugins/inspect/plugin-cdio.xml +++ b/docs/plugins/inspect/plugin-cdio.xml @@ -3,10 +3,10 @@ Read audio from audio CDs ../../ext/cdio/.libs/libgstcdio.so libgstcdio.so - 0.10.15.1 + 0.10.15.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-dvdlpcmdec.xml b/docs/plugins/inspect/plugin-dvdlpcmdec.xml index 125797608c..0b481ffbf9 100644 --- a/docs/plugins/inspect/plugin-dvdlpcmdec.xml +++ b/docs/plugins/inspect/plugin-dvdlpcmdec.xml @@ -3,10 +3,10 @@ Decode DVD LPCM frames into standard PCM ../../gst/dvdlpcmdec/.libs/libgstdvdlpcmdec.so libgstdvdlpcmdec.so - 0.10.15.1 + 0.10.15.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-dvdread.xml b/docs/plugins/inspect/plugin-dvdread.xml index 09d0cfdce7..e1a6f224e7 100644 --- a/docs/plugins/inspect/plugin-dvdread.xml +++ b/docs/plugins/inspect/plugin-dvdread.xml @@ -3,10 +3,10 @@ Access a DVD with dvdread ../../ext/dvdread/.libs/libgstdvdread.so libgstdvdread.so - 0.10.15.1 + 0.10.15.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-dvdsub.xml b/docs/plugins/inspect/plugin-dvdsub.xml index 5c2c5d60ff..2465c631ba 100644 --- a/docs/plugins/inspect/plugin-dvdsub.xml +++ b/docs/plugins/inspect/plugin-dvdsub.xml @@ -3,10 +3,10 @@ DVD subtitle parser and decoder ../../gst/dvdsub/.libs/libgstdvdsub.so libgstdvdsub.so - 0.10.15.1 + 0.10.15.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-iec958.xml b/docs/plugins/inspect/plugin-iec958.xml index f48d4dc31d..8ad579f990 100644 --- a/docs/plugins/inspect/plugin-iec958.xml +++ b/docs/plugins/inspect/plugin-iec958.xml @@ -3,10 +3,10 @@ Convert raw AC3 into IEC958 (S/PDIF) frames ../../gst/iec958/.libs/libgstiec958.so libgstiec958.so - 0.10.15.1 + 0.10.15.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-lame.xml b/docs/plugins/inspect/plugin-lame.xml index fff64ec818..55e2e40eb2 100644 --- a/docs/plugins/inspect/plugin-lame.xml +++ b/docs/plugins/inspect/plugin-lame.xml @@ -3,10 +3,10 @@ Encode MP3s with LAME ../../ext/lame/.libs/libgstlame.so libgstlame.so - 0.10.15.1 + 0.10.15.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mad.xml b/docs/plugins/inspect/plugin-mad.xml index 975ff6aa43..e07953c1d5 100644 --- a/docs/plugins/inspect/plugin-mad.xml +++ b/docs/plugins/inspect/plugin-mad.xml @@ -3,10 +3,10 @@ mp3 decoding based on the mad library ../../ext/mad/.libs/libgstmad.so libgstmad.so - 0.10.15.1 + 0.10.15.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mpeg2dec.xml b/docs/plugins/inspect/plugin-mpeg2dec.xml index 5751283e29..397edac388 100644 --- a/docs/plugins/inspect/plugin-mpeg2dec.xml +++ b/docs/plugins/inspect/plugin-mpeg2dec.xml @@ -3,10 +3,10 @@ LibMpeg2 decoder ../../ext/mpeg2dec/.libs/libgstmpeg2dec.so libgstmpeg2dec.so - 0.10.15.1 + 0.10.15.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mpegaudioparse.xml b/docs/plugins/inspect/plugin-mpegaudioparse.xml index 4c91a97c2c..c80138eca3 100644 --- a/docs/plugins/inspect/plugin-mpegaudioparse.xml +++ b/docs/plugins/inspect/plugin-mpegaudioparse.xml @@ -3,10 +3,10 @@ MPEG-1 layer 1/2/3 audio stream elements ../../gst/mpegaudioparse/.libs/libgstmpegaudioparse.so libgstmpegaudioparse.so - 0.10.15.1 + 0.10.15.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mpegstream.xml b/docs/plugins/inspect/plugin-mpegstream.xml index 99c3a6f5c5..1f55f9586b 100644 --- a/docs/plugins/inspect/plugin-mpegstream.xml +++ b/docs/plugins/inspect/plugin-mpegstream.xml @@ -3,10 +3,10 @@ MPEG system stream parser ../../gst/mpegstream/.libs/libgstmpegstream.so libgstmpegstream.so - 0.10.15.1 + 0.10.15.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-realmedia.xml b/docs/plugins/inspect/plugin-realmedia.xml index 26e5a05b36..bd003464b7 100644 --- a/docs/plugins/inspect/plugin-realmedia.xml +++ b/docs/plugins/inspect/plugin-realmedia.xml @@ -3,10 +3,10 @@ RealMedia support plugins ../../gst/realmedia/.libs/libgstrmdemux.so libgstrmdemux.so - 0.10.15.1 + 0.10.15.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-siddec.xml b/docs/plugins/inspect/plugin-siddec.xml index c44f08c991..3c5a024d88 100644 --- a/docs/plugins/inspect/plugin-siddec.xml +++ b/docs/plugins/inspect/plugin-siddec.xml @@ -3,10 +3,10 @@ Uses libsidplay to decode .sid files ../../ext/sidplay/.libs/libgstsid.so libgstsid.so - 0.10.15.1 + 0.10.15.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-twolame.xml b/docs/plugins/inspect/plugin-twolame.xml index f5cccc120c..fd5d277c3c 100644 --- a/docs/plugins/inspect/plugin-twolame.xml +++ b/docs/plugins/inspect/plugin-twolame.xml @@ -3,10 +3,10 @@ Encode MP2s with TwoLAME ../../ext/twolame/.libs/libgsttwolame.so libgsttwolame.so - 0.10.15.1 + 0.10.15.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-x264.xml b/docs/plugins/inspect/plugin-x264.xml index 201093d105..056183a380 100644 --- a/docs/plugins/inspect/plugin-x264.xml +++ b/docs/plugins/inspect/plugin-x264.xml @@ -3,10 +3,10 @@ libx264-based H264 plugins ../../ext/x264/.libs/libgstx264.so libgstx264.so - 0.10.15.1 + 0.10.15.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/win32/common/config.h b/win32/common/config.h index 8c37a9e190..52c4863d0f 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -23,6 +23,9 @@ /* Default visualizer */ #define DEFAULT_VISUALIZER "goom" +/* Disable Orc */ +#undef DISABLE_ORC + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -43,7 +46,7 @@ #define GST_LICENSE "LGPL" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer Ugly Plug-ins git" +#define GST_PACKAGE_NAME "GStreamer Ugly Plug-ins prerelease" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" @@ -159,6 +162,9 @@ /* Define to enable mpeg2dec (used by mpeg2dec). */ #undef HAVE_MPEG2DEC +/* Use Orc */ +#undef HAVE_ORC + /* defined if the compiler implements __PRETTY_FUNCTION__ */ #undef HAVE_PRETTY_FUNCTION @@ -224,7 +230,7 @@ #define PACKAGE_NAME "GStreamer Ugly Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Ugly Plug-ins 0.10.15.1" +#define PACKAGE_STRING "GStreamer Ugly Plug-ins 0.10.15.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-ugly" @@ -233,7 +239,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.15.1" +#define PACKAGE_VERSION "0.10.15.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -261,7 +267,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.10.15.1" +#define VERSION "0.10.15.2" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */