From 3c7a2738d0d126443308720fb6af0ae42d085e2b Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 23 Feb 2010 22:49:59 +0000 Subject: 1.1.18. --- ChangeLog | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41fb3da69..c8f708835 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xine-lib (1.1.18) 20??-??-?? +xine-lib (1.1.18) 2010-02-23 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix various problems with FLAC playback. * Build fix (undefined symbol) for when using older ffmpeg. diff --git a/debian/changelog b/debian/changelog index 7dec249a7..2a6e610f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xine-lib (1.1.18~hg-0) unstable; urgency=low +xine-lib (1.1.19~hg-0) unstable; urgency=low * Hg snapshot (dev build). Changelog is irrelevant :-) - -- Darren Salt Fri, 04 Dec 2009 17:15:06 +0000 + -- Darren Salt Tue, 23 Feb 2010 22:49:45 +0000 xine-lib (1.1.5~cvs-0) unstable; urgency=low -- cgit v1.2.3 From dabb44bc7b016c5c1b06a264784585ca1970afe2 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 23 Feb 2010 23:05:36 +0000 Subject: Added tag 1.1.18 for changeset 86395fcaded3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0ee760235..3e3b3c29d 100644 --- a/.hgtags +++ b/.hgtags @@ -151,3 +151,4 @@ e33280bcaa3b1f3f5b93e633e2225e2440ecfd7c 1.1.16 ff19463729d8f9bbea35171d641c5f28cdacc7c8 1.1.16.2 fc1aecbb9d80a32d9c802a5208dfdc012f1ba9d5 1.1.16.3 ff764395a361257b11d73583a0e0851e0f5f2ee5 1.1.17 +86395fcaded38aca33facf7c8263d23622eea2bd 1.1.18 -- cgit v1.2.3 From 293a8f011bc74b9089cff8c1a52e51d4cb578b2d Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 24 Feb 2010 01:30:53 +0000 Subject: src/dxr3/compat.h needs to be in the tarball... --- ChangeLog | 3 +++ src/dxr3/Makefile.am | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index c8f708835..507ad6c07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +xine-lib (1.1.18.1) 2010-??-?? + * Oops. compat.c (for DXR3 support) was omitted. + xine-lib (1.1.18) 2010-02-23 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix various problems with FLAC playback. diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index f6beb521a..1027d0e44 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -18,6 +18,8 @@ if HAVE_LIBRTE link_rte = -lrte endif +EXTRA_DIST = compat.c + xineplug_LTLIBRARIES = $(dxr3_modules) xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c -- cgit v1.2.3 From b808b9acc254027fa881c3123ab1b73984e2c1dd Mon Sep 17 00:00:00 2001 From: Ulrich Eckhardt Date: Sun, 21 Feb 2010 20:12:01 +0100 Subject: Avoid invalid fstat calls when opening empty files When opening empty files with xine, it reports: > This is xine (X11 gui) - a free video player v0.99.6cvs. > (c) 2000-2007 The xine Team. > system call fstat: Bad file descriptor > system call fstat: Bad file descriptor > call failed > object not accessible > object not accessible > call failed The problem was that when detecting an empty file, it is closed, but the file descriptor in struct file_input_plugin_t is still left at the previous value, causing the errors when it is used later. --- src/input/input_file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/input/input_file.c b/src/input/input_file.c index 208a5420e..b0da2565d 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -409,6 +409,7 @@ static int file_plugin_open (input_plugin_t *this_gen ) { if (file_plugin_get_length (this_gen) == 0) { _x_message(this->stream, XINE_MSG_FILE_EMPTY, this->mrl, NULL); close (this->fh); + this->fh = -1; xine_log (this->stream->xine, XINE_LOG_MSG, _("input_file: File empty: >%s<\n"), this->mrl); return -1; -- cgit v1.2.3 From f6fe1935082d9dc1c6f923e80f62c9e9c90d1169 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 24 Feb 2010 23:57:04 +0000 Subject: Fix up V4L/V4L2 for non-Linux. --- ChangeLog | 1 + configure.ac | 10 +++++++--- src/input/Makefile.am | 5 ++++- src/input/input_v4l2.c | 8 +++++++- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 507ad6c07..1e92e2a7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ xine-lib (1.1.18.1) 2010-??-?? * Oops. compat.c (for DXR3 support) was omitted. + * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. xine-lib (1.1.18) 2010-02-23 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix diff --git a/configure.ac b/configure.ac index d41b0442c..f5310590c 100644 --- a/configure.ac +++ b/configure.ac @@ -678,15 +678,19 @@ dnl ---------------------------------------------- AC_ARG_ENABLE([v4l], AS_HELP_STRING([--disable-v4l], [do not build Video4Linux input plugins])) +have_v4l=no +have_v4l2=no if test "x$enable_v4l" != "xno"; then - AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h], [have_v4l=yes], [have_v4l=no]) + AC_CHECK_HEADERS([linux/videodev.h], [have_v4l=yes], []) + AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h sys/videodev2.h], [have_v4l2=yes], []) AC_CHECK_HEADERS([asm/types.h]) - if test "x$enable_v4l" = "xyes" && test "x$have_v4l" = "xno"; then + if test "x$enable_v4l" = "xyes" && test "x$have_v4l$have_v4l2" = "xnono"; then AC_MSG_ERROR([Video4Linux support requested, but prerequisite headers not found.]) fi fi AM_CONDITIONAL(HAVE_V4L, [test "x$have_v4l" = "xyes"]) +AM_CONDITIONAL(HAVE_V4L2, [test "x$have_v4l2" = "xyes"]) dnl ---------------------------------------------- dnl Check for libv4l support @@ -694,7 +698,7 @@ dnl ---------------------------------------------- AC_ARG_ENABLE([libv4l], AS_HELP_STRING([--disable-libv4l], [do not build with libv4l support])) -if test "x$have_v4l" = xyes; then +if test "x$have_v4l2" = xyes; then have_libv4l=no PKG_CHECK_MODULES([V4L2], [libv4l2], [have_libv4l=yes diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 1c34f9aaa..beb101f8c 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -21,10 +21,13 @@ endif if HAVE_V4L in_v4l = xineplug_inp_v4l.la -in_v4l2 = xineplug_inp_v4l2.la in_pvr = xineplug_inp_pvr.la endif +if HAVE_V4L2 +in_v4l2 = xineplug_inp_v4l2.la +endif + if HAVE_GNOME_VFS in_gnome_vfs = xineplug_inp_gnome_vfs.la endif diff --git a/src/input/input_v4l2.c b/src/input/input_v4l2.c index 255b1f17c..5396594f4 100644 --- a/src/input/input_v4l2.c +++ b/src/input/input_v4l2.c @@ -37,7 +37,13 @@ #include #include #include -#include +#ifdef HAVE_SYS_VIDEOIO_H +# include +#elif defined(HAVE_SYS_VIDEODEV2_H) +# include +#else +# include +#endif #include #include #include -- cgit v1.2.3 From cb82d7b686affd1d90e72b88acddf8d8d99ed972 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 25 Feb 2010 00:02:29 +0000 Subject: Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. --- ChangeLog | 1 + src/input/libreal/rmff.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1e92e2a7b..0ef413aac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ xine-lib (1.1.18.1) 2010-??-?? * Oops. compat.c (for DXR3 support) was omitted. * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. + * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. xine-lib (1.1.18) 2010-02-23 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c index 6a2b761e1..82554a350 100644 --- a/src/input/libreal/rmff.c +++ b/src/input/libreal/rmff.c @@ -375,7 +375,7 @@ static rmff_mdpr_t *rmff_scan_mdpr(const char *data) mdpr->mime_type[mdpr->mime_type_size]=0; mdpr->type_specific_len=_X_BE_32(&data[42+mdpr->stream_name_size+mdpr->mime_type_size]); - if (mdpr->size < 46 + mdpr->stream_name_size + mdpr->mime_type_size + mdpr->type_specific_data) + if (mdpr->size < 46 + mdpr->stream_name_size + mdpr->mime_type_size + mdpr->type_specific_len) goto fail; mdpr->type_specific_data = malloc(mdpr->type_specific_len); if (!mdpr->type_specific_data) -- cgit v1.2.3 From cdeee7eb6710adb3fee02c4e5f1e7493f2af70cc Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 25 Feb 2010 00:09:11 +0000 Subject: isatty() takes an int, not a FILE *. --- src/input/net_buf_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index 1ac0cb066..e8af1ae3f 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.c @@ -133,7 +133,7 @@ static void display_stats (nbc_t *this) { this->audio_in_disc, buffering[this->buffering], enabled[this->enabled], - isatty (stdout) ? '\r' : '\n' + isatty (STDOUT_FILENO) ? '\r' : '\n' ); fflush(stdout); } -- cgit v1.2.3 From 5dc1f14b931db97076d32bb1285354fa304ebae2 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 25 Feb 2010 00:48:12 +0000 Subject: Compiler warning fixes. --- src/input/libdvdnav/decoder.c | 2 +- src/input/libdvdnav/ifo_read.c | 4 ++-- src/input/libdvdnav/vmcmd.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c index 3dff4a080..4ae64377b 100644 --- a/src/input/libdvdnav/decoder.c +++ b/src/input/libdvdnav/decoder.c @@ -569,7 +569,7 @@ static int32_t eval_command(uint8_t *bytes, registers_t* registers, link_t *retu if(command.instruction & ~ command.examined) { fprintf(MSG_OUT, "libdvdnav: decoder.c: [WARNING, unknown bits:"); - fprintf(MSG_OUT, " %08llx", (command.instruction & ~ command.examined) ); + fprintf(MSG_OUT, " %08"PRIx64, (command.instruction & ~ command.examined) ); fprintf(MSG_OUT, "]\n"); } diff --git a/src/input/libdvdnav/ifo_read.c b/src/input/libdvdnav/ifo_read.c index bc1ba580b..61500caa2 100644 --- a/src/input/libdvdnav/ifo_read.c +++ b/src/input/libdvdnav/ifo_read.c @@ -654,10 +654,10 @@ static int ifoRead_PGC(ifo_handle_t *ifofile, pgc_t *pgc, unsigned int offset) { /* verify time (look at print_time) */ for(i = 0; i < 8; i++) - if(!pgc->audio_control[i] & 0x8000) /* The 'is present' bit */ + if(!(pgc->audio_control[i] & 0x8000)) /* The 'is present' bit */ CHECK_ZERO(pgc->audio_control[i]); for(i = 0; i < 32; i++) - if(!pgc->subp_control[i] & 0x80000000) /* The 'is present' bit */ + if(!(pgc->subp_control[i] & 0x80000000)) /* The 'is present' bit */ CHECK_ZERO(pgc->subp_control[i]); /* Check that time is 0:0:0:0 also if nr_of_programs == 0 */ diff --git a/src/input/libdvdnav/vmcmd.c b/src/input/libdvdnav/vmcmd.c index 24bdfe6e2..84a90dfd6 100644 --- a/src/input/libdvdnav/vmcmd.c +++ b/src/input/libdvdnav/vmcmd.c @@ -517,7 +517,7 @@ void vm_print_mnemonic(vm_cmd_t *vm_command) { if(command.instruction & ~ command.examined) { fprintf(MSG_OUT, " libdvdnav: vmcmd.c: [WARNING, unknown bits:"); - fprintf(MSG_OUT, " %08llx", (command.instruction & ~ command.examined) ); + fprintf(MSG_OUT, " %08"PRIx64, (command.instruction & ~ command.examined) ); fprintf(MSG_OUT, "]"); } } -- cgit v1.2.3 From 032fc4e2349ca6d047110311eb8f69b4556ee3e6 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 25 Feb 2010 18:06:31 +0000 Subject: Fix build with the old, outdated and deprecated internal ffmpeg. --- ChangeLog | 1 + configure.ac | 2 ++ src/combined/ffmpeg/ffmpeg_decoder.c | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0ef413aac..f64a0e656 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ xine-lib (1.1.18.1) 2010-??-?? * Oops. compat.c (for DXR3 support) was omitted. * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. + * Fix build with the old, outdated and deprecated internal ffmpeg. xine-lib (1.1.18) 2010-02-23 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix diff --git a/configure.ac b/configure.ac index f5310590c..b098aaa5f 100644 --- a/configure.ac +++ b/configure.ac @@ -3008,8 +3008,10 @@ echo " * audio decoder plugins:" echo " - GSM 06.10 - linear PCM" if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" + echo " - Windows Media Audio v1/v2/Pro" else echo " - ffmpeg (internal library):" + echo " - Windows Media Audio v1/v2" fi echo " - Windows Media Audio v1/v2/Pro" echo " - DV - logarithmic PCM" diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c index adf0dad78..6d0bfa432 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.c +++ b/src/combined/ffmpeg/ffmpeg_decoder.c @@ -228,7 +228,6 @@ void avcodec_register_all(void) REGISTER_DECODER(WAVPACK, wavpack); REGISTER_DECODER(WMAV1, wmav1); REGISTER_DECODER(WMAV2, wmav2); - REGISTER_DECODER(WMAPRO, wmapro); REGISTER_DECODER(WS_SND1, ws_snd1); /* pcm codecs */ -- cgit v1.2.3 From e68539d3a13bf998f3fb421c852c1c8d60d59198 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 1 Mar 2010 20:44:06 +0000 Subject: Changelog line length & trailing space cleanup. --- ChangeLog | 207 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 113 insertions(+), 94 deletions(-) diff --git a/ChangeLog b/ChangeLog index f64a0e656..d51429d21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,7 +31,8 @@ xine-lib (1.1.17) 2009-12-01 * Initial parsing of Xing header LAME extension. * Fixes for gapless playback. * Added padding delay to the first and last frames (MPEG audio). - * Fixed buggy discontinuity handling when playing short streams and using the gapless switch. The current time should not be used here. + * Fixed buggy discontinuity handling when playing short streams and using + the gapless switch. The current time should not be used here. * Added audio padding handling. (New buffer flag for this.) * Fix seeking in large raw DV files. * Ported to new libmpcdec API (retaining build compat. with the old API). @@ -248,7 +249,7 @@ xine-lib (1.1.10.1) 2008-02-07 xine-lib (1.1.10) 2008-01-26 * Security fixes: - Buffer overflow which allows a remote attacker to execute arbitrary - code or crash the client program via a crafted ASF header. + code or crash the client program via a crafted ASF header. (CVE-2008-1110, related to CVE-2006-1664) * Update Ogg and Annodex mimetypes and extensions. * Change the default v4l device paths to /dev/video0 and /dev/radio0. @@ -561,7 +562,7 @@ xine-lib (1.1.3) 2006-12-03 xine-lib (1.1.2) 2006-07-09 * Security fixes: - CVE-2005-4048: possible buffer overflow in libavcodec (crafted PNGs). - - CVE-2006-2802: possible buffer overflow in the HTTP plugin. + - CVE-2006-2802: possible buffer overflow in the HTTP plugin. - possible buffer overflow via bad indexes in specially-crafted AVI files * Update gettext support to 0.14.5, disable internal gettext, fix locales handling, use the correct domain for strings. @@ -583,7 +584,8 @@ xine-lib (1.1.2) 2006-07-09 * FFmpeg update (version 51.1.0) * Fix detection of locale containing a modifier (like "@euro") * New volume normalization post plugin - * New image noise post plugin (useful for mitigating some compression artifacts) + * New image noise post plugin (useful for mitigating some compression + artifacts) * Support for Vorbis-style comments in FLAC files * Coverity fixes * Add ATSC support to the DVB plugin @@ -593,14 +595,14 @@ xine-lib (1.1.2) 2006-07-09 * Fix install problems in case configure was generated by autoconf >= 2.59c. * Fixed some win32 codec freezes when configured w32-path doesn't exist * Add support for RealPlayer 10 codecs (from SUSE) - + xine-lib (1.1.1) 2005-11-15 * Improve sound quality when using alsa 1.0.9 or above. When playing a 44.1khz stream on a 48khz only capable sound card. It bypasses alsa-lib resampler and uses xine's * Windows ports bug fixes and improvements * Set up the framebuffer palette (fb video out). - * build fixes and improvements, added --with-pthread-prefix and + * build fixes and improvements, added --with-pthread-prefix and --with-zlib-prefix options * new DirectFB video output plugin with many improvements (output to overlay or TV, deinterlacing, image controls, zoom, OSD, double/triple buffering, @@ -609,11 +611,13 @@ xine-lib (1.1.1) 2005-11-15 * experimental frame allocation optimization reduces cpu usage of the deinterlacer plugin by up 25% * implement time seeking on DVD plugin - * move CFLAGS optimizations to a separated file (added --disable-optimizations) + * move CFLAGS optimizations to a separated file + (added --disable-optimizations) * use the same codec path as MPlayer (/usr[/local]/lib/codecs) * FFmpeg sync (new QDM2 decoder) * imported Duck TrueMotion 2 decoder from FFmpeg - * sync libfaad2 to latest GPL compatible version; fixes AAC decoding on x86_64 arch + * sync libfaad2 to latest GPL compatible version; + fixes AAC decoding on x86_64 arch * support gapless playback while switching streams (requires UI cooperation) * fix speed changing race causing deadlock with v4l plugin * cddb improvements/fixes (DTITLE/DYEAR parsing, timeout increase and @@ -624,7 +628,7 @@ xine-lib (1.1.0) 2005-07-26 * new quality deinterlacer from dscaler: TomsMoComp (Tom's Motion Compensated) * added help for most deinterlace methods * ffmpeg update - * use ImageMagick to convert and display different type of images (png, jpg...) + * use ImageMagick to convert & display different type of images (png, jpg...) * improve ASX playlist parsing * add an extended MRL reference event (MRL title, start time, play time): needed for the ASX parser; deprecates plain MRL reference events. @@ -643,10 +647,11 @@ xine-lib (1.0.3) xine-lib (1.0.2) * fixed playback of single-session Real RTSP streams, such as rtsp://stream.samurai.fm/broadcast/live_hi.rm - * fixed xxmc / xvmc mocomp / IDCT rendering errors caused by the big update. + * fixed xxmc / xvmc mocomp / IDCT rendering errors caused by the big update. * support --enable-fpic with recent versions of gcc * clip goom fps value to >= 1 [Bug SF 1193783] - * fixed xvmc plugin segfault when it tried software blending on nonexistant xv image + * fixed xvmc plugin segfault when it tried software blending on nonexistent + xv image * cleaned up libmpeg2 behaviour on xxmc plugin abrupt software fallback * use -fno-inline-functions with gcc < 3.4.0 (bug known to be in 3.3.5) * fix xxmc plugin wanting to change vld xvmc context when stream changes from @@ -654,11 +659,12 @@ xine-lib (1.0.2) * speed up xx44 alphablending of large transparent areas * stop libmpeg2 XvMC IDCT / MOCOMP attempting software motion compensation [Bug SF 1194754] - * improve xxmc cpu-usage for IDCT / MOCOMP acceleration through better locking - [Bug SF 1195282] + * improve xxmc cpu-usage for IDCT / MOCOMP acceleration through better + locking [Bug SF 1195282] * gcc4 build patches [Bug SF 1175002] * don't assume that file is in /usr/bin (build fix) [Bug SF 1195539] - * plugin loader fixes - could cause xine to lock up hard on startup [Bug SF 1196819] + * plugin loader fixes - could cause xine to lock up hard on startup + [Bug SF 1196819] * Fix xxmc bob deinterlacing for field-coded interlaced streams * Fix LE_64/BE_64 macros on non-x86 plataforms. may fixes issues with some demuxers like avi, asf and ogg. @@ -669,9 +675,10 @@ xine-lib (1.0.2) * fixed deadlock when libxine was called from the event listener thread and tried to flush all pending events. * Added xine(5), documenting MRL syntax. - * allow playing just a single title/chapter from dvd (useful for extracting audio - - check media.dvd.play_single_chapter) - * new stream infos allows frontends to query current title/chapter/angle on dvds + * allow playing just a single title/chapter from dvd (useful for extracting + audio - check media.dvd.play_single_chapter) + * new stream infos allows frontends to query current title/chapter/angle on + DVDs * new upmix_mono audio post plugin to convert mono to stereo * added --with-external-a52dec and --with-external-libmad switches * fix a locking bug which affects configuration callback functions @@ -679,9 +686,9 @@ xine-lib (1.0.2) greater installed xine-lib (1.0.1) - * Big XvMC quality / correctness / cpu-usage fix. [Bug SF 1114517] + * Big XvMC quality / correctness / cpu-usage fix. [Bug SF 1114517] * fixed builds with Xv or the entire X11 unavailable - * updated internal copies of VCD libraries to libcdio 0.71 and vcdimager 0.7.21 + * updated internal copies of VCD libraries to libcdio 0.71 & vcdimager 0.7.21 * fixed compatibility with new libtool versions [Bug SF 1094262] * renamed input.http_no_proxy to media.network.http_no_proxy * tightened no-proxy domain matching & added exact host match ('=' prefix) @@ -710,7 +717,7 @@ xine-lib (1.0.1) * Win32 port updates: cross compilation of VCD, external ffmpeg with MSVC * fixed pthread leak * fixed onefield_xv deprecated deinterlace method - * multiple slice-per-rows (HDTV) fixes in the libmpeg2 code, particularly + * multiple slice-per-rows (HDTV) fixes in the libmpeg2 code, particularly regarding VLD XvMC. * cleaned up hardware acceleration hooks in libmpeg2. * fixed X include path searching while configure detects XvMC support. @@ -727,31 +734,35 @@ xine-lib (1.0) 2004-12-25 * added support for OGG chained streams * fixed deadlock with ASF chained streams due to fifo buffer leak * DVB Subtitles: fixed flashing, repeating subs, fix sync & timeouts - * DVB EPG: fixed incorrectly parsed running status, clear old epg data, cropped epg texts + * DVB EPG: fixed incorrectly parsed running status, clear old epg data, + cropped epg texts * updated included libdvdnav: more graceful handling of some error conditions; fixed playback of some strangely authored DVDs - * fixed problem with first subtitle not showing when using separate subtitle files - * fixed crash related to relative HTTP redirect URLs (implemented canonicalisation) + * fixed problem with first subtitle not showing when using separate subtitle + files + * fixed crash related to relative HTTP redirect URLs + (implemented canonicalisation) * linking libXv dynamically, fixes breakage of Xv plugin xine-lib (1-rc8) 2004-12-15 * Multiple security vulnerabilities fixed on PNM and Real RTSP clients * Rewrote OpenGL output plugin. - * Fixed segfault when seeking with the "xvmc" and "xxmc" plugins playing - files with IDCT / mocomp XvMC acceleration. + * Fixed segfault when seeking with the "xvmc" and "xxmc" plugins playing + files with IDCT / mocomp XvMC acceleration. * polypaudio sound server support - * fixed playback of MMS streams with the new input cache layer [Bug SF 1066926] + * fixed playback of MMS streams with the new input cache layer + [Bug SF 1066926] * fixed builds without X11 [Bug SF 1067705] * added support for 24-bit LPCM from DVDs [Bug SF 843786] - * Fixed segfault in xxmc plugin when switch from software decoding to - accelerated decoding occured while software surfaces still needed to be + * Fixed segfault in xxmc plugin when switch from software decoding to + accelerated decoding occured while software surfaces still needed to be duplicated. * fixed plugin catalog cache (faster xine startup) - * updated internal goom to 2k4-dev21; randomized and improved look of + * updated internal goom to 2k4-dev21; randomized and improved look of initial effect (hopefully no more white screens any more) * DVB: Fixed pat parsing with fullfeatured cards. - * DVB: Now uses auto-inversion if the frontend supports it - should solve many tuning - problems for people with sat cards. + * DVB: Now uses auto-inversion if the frontend supports it - should solve + many tuning problems for people with sat cards. * DVB: Will now verify that channels.conf file is in correct (?zap) format. * fixed OSS mixer disabling itself after first playlist entry * improved overlay blending quality, fixed subtitles with XShm @@ -767,7 +778,7 @@ xine-lib (1-rc8) 2004-12-15 * implemented winamp.com "streaming" protocol * meta info (title, artist, etc) returned by the xine-lib is now UTF8 * new XINE_META_INFO_TRACK_NUMBER meta info - + xine-lib (1-rc7) 2004-11-04 * Build system improvements: replacement functions, better work with headers * Set the codec name for Real Media even if we can't play the files @@ -778,15 +789,15 @@ xine-lib (1-rc7) 2004-11-04 (these files required cropping after decoding) * Fix crashes with some input plugins when no audio output was available * Windows ports updates and cleanups - * new xxmc driver supporting XvMC with extended vld (for VIA CLE266), - idct and mocomp accelerations. includes automatic Xv fallback for + * new xxmc driver supporting XvMC with extended vld (for VIA CLE266), + idct and mocomp accelerations. includes automatic Xv fallback for non-mpeg streams. supports overlays and OSD. * suggested using the libXvMCW so xine won't depend on any vendor specific library. you can get the old behaviour (not recommended) - using ./configure --with-xvmc-lib=XvMCNVIDIA. - The wrapper library libXvMCW is present in Xorg CVS or downloadable - standalone from http://sourceforge.net/projects/unichrome. - It will dlopen a hardware-specific XvMC library at runtime. + using ./configure --with-xvmc-lib=XvMCNVIDIA. + The wrapper library libXvMCW is present in Xorg CVS or downloadable + standalone from http://sourceforge.net/projects/unichrome. + It will dlopen a hardware-specific XvMC library at runtime. * Some fixes for crashes when trying to play encrypted DVDs without libdvdcss * DXR3: fixed some rare audio dropouts * DXR3: fixed forced subtitle handling; this fixes missing subtitles in @@ -811,9 +822,9 @@ xine-lib (1-rc7) 2004-11-04 * use monotonic clock where available (eg. linux 2.6) so system clock updates won't disturb xine playback. [Bug SF 781532] * fixed seeking unresponsiveness when using external subtitles - * Allowed multiple simultaneous thread access in parts of the xxmc driver, + * Allowed multiple simultaneous thread access in parts of the xxmc driver, assuming that XvMC libraries are thread-safe. - + xine-lib (1-rc6) 2004-09-16 * Moved win32 frontend into separate module. * Fixed Xv initialization to enable multiple instances of the Xv plugin @@ -833,7 +844,7 @@ xine-lib (1-rc6) 2004-09-16 * Fixed brightness drift problem (loss of color) [Bugs SF 947520, SF 963587] * Fixed rare heap overflow with some DVD subpictures [Bug SF 923843] * Fixed stack overflows in the VCD plugin - * Added experimental time stretching plugin: play stream faster or + * Added experimental time stretching plugin: play stream faster or slower than original speed, optionally preserving pitch * Fixed another win32 dll crash (after playing several files) * Added configure option for building xine with external ffmpeg library @@ -851,7 +862,7 @@ xine-lib (1-rc6) 2004-09-16 * Added experimental support for H.264/AVC video * Added support for 3ivx video -xine-lib (1-rc5) +xine-lib (1-rc5) * add support for ejecting removable media on Solaris * fix stuttering playback of some realmedia streams * fix end of stream handling in the http plugin @@ -921,7 +932,7 @@ xine-lib (1-rc4) 2004-04-28 * fix 24 bpp RGB output - may affect some users of xshm and fb * generate events for "Permission denied" and "File not found" in the http and file plugins - * DXR3: fix menu highlight areas in letterboxed overlay mode with + * DXR3: fix menu highlight areas in letterboxed overlay mode with pan&scan content * DXR3: fix libavcodec encoder for frame widths not a multiple of 16 * mediaLib now used for bilinear scaling @@ -1069,7 +1080,7 @@ xine-lib (1-rc3) 2003-12-16 * id3v2.3 parser * fix playback of 8 bit sound when the soundcard doesn't support them - + xine-lib (1-rc2) 2003-10-25 * XvMC support for hardware accelerated mpeg2 playback (-V xvmc) * Fix some errors in sound state when exiting xine and using alsa. @@ -1087,8 +1098,8 @@ xine-lib (1-rc2) 2003-10-25 * fix mpeg 2 audio frame parsing (mpeg_audio demuxer) * fix segmentation fault in mms when iconv_open fails * allow lazy loading of Sun mediaLib (configure --enable-mlib-lazyload) - * clugged security hole in RIP input plugin - all saved data are - stored into one dir now, default save directory is empty what means + * clugged security hole in RIP input plugin - all saved data are + stored into one dir now, default save directory is empty what means disable saving (problem reported by Michiel Toneman, many thanks) * the former VCDX plugin is now the default VCD plugin which opens up a world of new features for VCD users (the old plugin is still @@ -1099,7 +1110,8 @@ xine-lib (1-rc1) * fix incorrect colours when blending frame with a big-endian RGB pixel format * add support for chroma keyed overlay graphics to video_out_pgx64 * add support for double and multi-buffering to video_out_pgx64 - * libdvdnav: fix some undetected stills (fixes "Red Dragon" RC2 scene selection) + * libdvdnav: fix some undetected stills + (fixes "Red Dragon" RC2 scene selection) * video output plugin for libstk * bugfix: detection of external subtitle formats * support for arbitrary aspect ratios @@ -1151,33 +1163,36 @@ xine-lib (1-rc0a) 2003-08-02 * don't abort on MPEG_block stream errors xine-lib (1-rc0) 2003-08-01 - * improved seeking accuracy of ogg_demuxer + * improved seeking accuracy of ogg_demuxer * xine broadcaster (send stream to multiple xine clients simultaneously) start master with 'xine --broadcast-port xxxx' start slaves with 'xine slave://master_address:xxxx' * nvtv updates and fixes * Nullsoft Video (.nsv) file demuxer * 4X Technologies (.4xm) file demuxer - * libdvdnav: fix some situations where an unlucky user could trigger assertions + * libdvdnav: fix some situations where an unlucky user could trigger + assertions * decoder priority handling: configuring a priority of 0 means "use default" users are advised to set all decoder priorities to 0 in their config files * dvd: and dvd: MRLs now work when a DVD is in the drive to - which the raw device setting points to (libdvdcss tried to access the raw device) + which the raw device setting points to (libdvdcss tried to access the raw + device) * fix dxr3 sync problems after seeking * fix potential playback problems for MPEG files with rare framerates (23.976, 59.94 and 60 fps) * move http proxy configuration to xine itself * add expand post video filter for displaying subtitles in borders * speex (http://www.speex.org) audio decoder support - * dxr3: libavcodec from xine's ffmpeg plugin can now be used for MPEG reencoding - (so reencoding is now possible without installing any additional libraries) + * dxr3: libavcodec from xine's ffmpeg plugin can now be used for MPEG + re-encoding (so reencoding is now possible without installing any + additional libraries) * add support for seeking in real media files * improved support for real video codecs - * new deinterlacer (tvtime) plugin with more algorithms, full framerate output, - 2-3 pulldown detection, judder correction, chroma upsampling error free, - works with all video drivers. warning: cpu intensive :) + * new deinterlacer (tvtime) plugin with more algorithms, full framerate + output, 2-3 pulldown detection, judder correction, chroma upsampling error + free, works with all video drivers. warning: cpu intensive :) * some post plugins ported from mplayer: boxblur, denoise3d, eq, eq2, unsharp - * big improvement of v4l input and associated demuxer. Including + * big improvement of v4l input and associated demuxer. Including sound capture using alsa and a/v sync. Now radio is supported as well. * dxr3: using decoder timestamps will hopefully fix some last sync problems * (hopefully) fix crashes with win32 Quicktime DLLs @@ -1192,13 +1207,15 @@ xine-lib (1-beta12) * playback of theorastreams added * updated nvtv support, and bug fixes * ac3 pcm-audiotype .wav files now supported via software decode. - Passthru not implemented yet due to lack of re-sync code in liba52 passthru mode. + Passthru not implemented yet due to lack of re-sync code in liba52 passthru + mode. * playback of cd/dvd over the network (see README.network_dvd) * use variable block program stream demuxer for mpeg2 files * cdda improvements (error handling, device on mrl) * input_pvr (ivtv) updates - * demux_mpeg_block improved to cure problems with VCDs and bogus encrypted messages. - + * demux_mpeg_block improved to cure problems with VCDs and bogus encrypted + messages. + xine-lib (1-beta11) 2003-04-28 * fix bugs in selecting ogm subtitles * fix multiple lines subtitles' display in OGM container @@ -1297,8 +1314,8 @@ xine-lib (1-beta5) 2003-02-21 * fixed gnome-vfs plugin to be used for remote locations (other than http) * at least for DVD input, the language reporting is now channel-aware * CD-ROM/XA ADPCM decoder - * QT demuxer fixes to select among multiple A/V traks and support - non- and poorly-interleaved files + * QT demuxer fixes to select among multiple A/V traks and support + non- and poorly-interleaved files * support for the css title key cache in the latest versions of a well known css decryption library * allow to crop the dxr3 overlay area to help users who see green lines @@ -1340,7 +1357,7 @@ xine-lib (1-beta3) 2003-01-28 * NSF audio decoding via Nosefart * DVB plugin updated to new DVB API, DVB-C and DVB-T support * gnome-vfs input plugin added - * external subtitles support. use either MRL syntax like + * external subtitles support. use either MRL syntax like "test.mpg#subtitle:file.sub" or the frontend option. * updated VIDIX driver (image controls supported) * "mms over http" streaming protocol support @@ -1361,8 +1378,8 @@ xine-lib (1-beta1) 2002-12-24 * improved engine for seeking and slider positioning * network input plugin is working again * handle avi files produced by dvgrab - * real media demuxer should handle most files now - * real media rv20/rv30 video and cook/sipro/dnet audio should work + * real media demuxer should handle most files now + * real media rv20/rv30 video and cook/sipro/dnet audio should work (except dnet x86 only) * real media rtsp protocol streaming support * mms input plugin cleanup/bugfixes/improvements @@ -1372,7 +1389,7 @@ xine-lib (1-beta1) 2002-12-24 * MNG demuxer added * raw dv demuxer added * many FLI/FLC fixes - + xine-lib (1-beta0) 2002-12-11 * fix decoder priority configuration * cache available plugins for faster xine loading @@ -1385,7 +1402,7 @@ xine-lib (1-beta0) 2002-12-11 * fb video output plugin ported to new architecture * MPEG-4 file (*.mp4) support * closed caption support ported to new architecture - + xine-lib (1-alpha2) 2002-11-27 * configurable image position * DVD menu button highlight position fixes @@ -1402,7 +1419,7 @@ xine-lib (1-alpha1) 2002-11-20 * transport stream demuxer fixes * DVD playback should be working again (please report DVDs that don't play!) * stdin_fifo input plugin - * vcd input plugin + * vcd input plugin * native Windows Media Audio (a.k.a. WMA, DivX audio) decoding via ffmpeg * XviD decoder is working again * DV decoder (ffmpeg) @@ -1434,9 +1451,10 @@ xine-lib (1-alpha0) 2002-11-04 * spu encoding for full overlay support with dxr3 * icecast/shoutcast support * dvd raw device support - * decode id3v1 tags in mp3 files + * decode id3v1 tags in mp3 files * updated internal liba52 to version 0.7.4 - * numeric selection of dvd menu buttons (could make some dvd easter eggs accesible) + * numeric selection of dvd menu buttons (could make some dvd easter eggs + accesible) * big api cleanup * xine engine can open more than one stream at a time * audio compressor filter @@ -1447,7 +1465,8 @@ xine-lib (1-alpha0) 2002-11-04 '?' is used to separate subtitle files * incorporated pgx64[fb] plugin * improved support for invalid mpeg streams - * some metronom changes hopefully improving some last glitches in dvd playback + * some metronom changes hopefully improving some last glitches in dvd + playback * URI conforming MRL syntax, new delimiter # for various stream parameters * variuos fixes for dxr3 overlay mode @@ -1467,7 +1486,7 @@ xine-lib (0.9.13) 2002-08-03 * Raw YUV video support * Microsoft RLE decoder * AAC decoder (FAAD2 library) - * Reworked ALSA audio support + * Reworked ALSA audio support * demux_qt improvements to handle .mp4 * initial support of Quicktime6 files * image redraw in paused mode (for window resize, adjusts etc) @@ -1489,7 +1508,7 @@ xine-lib (0.9.12) 2002-06-23 -- Guenter Bartsch xine-lib (0.9.11) 2002-06-20 - + * sync with ffmpeg cvs * some endianess and 64bit machine fixes * better quality using linearblend filter @@ -1509,7 +1528,7 @@ xine-lib (0.9.11) 2002-06-20 * support setting config options using "opt:" pseudo MRLs -- Guenter Bartsch - + xine (0.9.10) 2002-05-28 * fixed snapshot: capture current frame with overlays @@ -1520,7 +1539,7 @@ xine (0.9.10) 2002-05-28 * new resizing behaviour for xine-ui: user may choose if stream size changes should update video window size. * fix VCD playback - * libmad updated to 0.14.2b and optimized for speed + * libmad updated to 0.14.2b and optimized for speed * cinepak video decoder (native) * libwin32 compilation fixes * dxr3 compilation fixes @@ -1529,10 +1548,10 @@ xine (0.9.10) 2002-05-28 * SDL video out driver (experimental) * XVidMode support fixed - -- Guenter Bartsch + -- Guenter Bartsch xine (0.9.9) 2002-05-28 - + * new (fast) demuxer seeking * libdivx4 updated to support divx5 * several memory leak fixes @@ -1544,7 +1563,7 @@ xine (0.9.9) 2002-05-28 * updated mpeg2dec (0.2.1) * new metronom code and discontinuity handling * logo moved to xine-lib - * improved still frame detection and video_out code + * improved still frame detection and video_out code * several dxr3 fixes * avi multiple audio stream support * font encoding support for avi subtitles @@ -1553,7 +1572,7 @@ xine (0.9.9) 2002-05-28 * better playing support for ffmpeg/win32 codecs on slow machines * using "%" instead of ":" as subtitle file seperator * xvid (http://www.xvid.org) codec support - * use of $CFLAGS instead of $GLOBAL_CFLAGS + * use of $CFLAGS instead of $GLOBAL_CFLAGS -- Guenter Bartsch Sat Apr 20 20:32:33 CEST 2002 @@ -1567,7 +1586,7 @@ xine (0.9.8) 2002-01-16 * metronom bugfixes * better looking OSD fonts * fix audio pause on discontinuities - * merged dxr3 and dxr3enc drivers into single dxr3 driver. See README.dxr3 + * merged dxr3 and dxr3enc drivers into single dxr3 driver. See README.dxr3 * dxr3 encoding support for librte-0.4 besides the traditional libfame. * support for (live) mpg streams via tcp * two new skins @@ -1643,7 +1662,7 @@ xine (0.9.3) 2001-11-02 * dxr3 option for 'zoom' mode (see README.dxr3) * dxr3 still-menu/audio sync fixes / menu buttons now auto-display * dxr3 now keeps BCS values in .xinerc / Aspect ratio autodetection - + xine (0.9.2) 2001-10-16 * bugfixes @@ -1689,7 +1708,7 @@ xine (0.5.2) 2001-09-03 * ffmpeg (mpeg4, opendivx ...) works on bigendian machines now * time-based seeking (try the cursor keys) * stream bitrate/length estimation (not implemented in all demuxers yet) - * transport stream support should work now + * transport stream support should work now * trick-plays (fast forward, slow motion, true pause function) * audio output architecture change @@ -1728,7 +1747,7 @@ xine (0.4.3) 2001-05-16 * tarball should be complete now * improved demuxer file type detection * making metronom a bit more tolerant for small wraps - * improved mp3 sample rate handling + * improved mp3 sample rate handling -- Guenter Bartsch Sun, 16 May 2001 22:59:00 +0200 @@ -1736,7 +1755,7 @@ xine (0.4.2) 2001-05-06 This is mainly a bugfix release for those who want a stable xine _now_, before the new, better, universal 0.5 architecture has stabilized. - + * RPM package fixes (version 0.4.01) * Stability/portability patches by Henry Worth (fixes lots of hangs and the like, should build on ppc now) @@ -1747,7 +1766,7 @@ xine (0.4.2) 2001-05-06 * fixed segfault bug with non-seekable input plugins * fifo plugin now refuses to handle plain file name MRLs (fixes broken seek for files on some installations) - + -- Siggi Langauf Sun, 6 May 2001 14:24:01 +0200 xine (0.4.0) 2001-03-02 @@ -1765,7 +1784,7 @@ xine (0.4.0) 2001-03-02 xine (0.3.7) 2001-02-04 * subpicture/subtitle support - * experimental AC3 digital output with some ALSA drivers + * experimental AC3 digital output with some ALSA drivers * restricted Debian build architecture to i386 (closes:Bug#83138,Bug#83541,Bug#83373) * added Setup dialog for brightness and contrast controls @@ -1806,7 +1825,7 @@ xine (0.3.4) 2001-01-08 * rudimentary support for win32 codecs * added Teletux support patch from Joachim Koenig * 3Dnow! support - * build improvements on K6/K7 processors + * build improvements on K6/K7 processors -- Siggi Langauf Mon, 8 Jan 2001 04:03:11 +0100 @@ -1822,13 +1841,13 @@ xine (0.3.3) 2001-01-04 -- Siggi Langauf Thu, 04 Jan 2001 01:37:42 +0100 xine (0.3.2) 2000-12-13 - + * audio rate up/downsampling * new yuv2rgb routines * anamorphic scaling for Xshm output * gui improvements (audio channel selection, fullscreen, skinfiles, slider, transparency, a new theme) - * ac3dec performance improved + * ac3dec performance improved * improved debugging/logging functions * improved dabian packages * RedHat 7 / gcc "2.96" build fixes @@ -1838,7 +1857,7 @@ xine (0.3.2) 2000-12-13 xine (0.3.1p1) 2000-11-21 * Bugfix for Debian package: 0.3.1 always segfaulted. This release should - work... + work... -- Siggi Langauf Tue, 21 Nov 2000 21:43:18 +0100 @@ -1850,13 +1869,13 @@ xine (0.3.1) 2000-11-20 * better audio driver detection * fixed aspect ratio bug * fixed pause function (restart pos) - * fixed playlist-next bug + * fixed playlist-next bug -- Siggi Langauf Sun, 19 Nov 2000 15:33:28 +0100 xine (0.3.0) 2000-11-18 - - NULL audio driver (ability to run without sound card) + - NULL audio driver (ability to run without sound card) - ALSA audio driver - pause function - simple playlist function @@ -1878,12 +1897,12 @@ xine (0.2.3) 2000-10-15 net_plugin, bug fixes (i.e. VCD ...) - xshm video output module fixed for bpp>16 (but don't use that for speed reasons!) - - new iDCT_mmx code from walken + - new iDCT_mmx code from walken => picture quality massively improved :)) - FAQ update - speed improvements due to new compiler switches - - minor Makefile fixes for FreeBSD ports - + - minor Makefile fixes for FreeBSD ports + -- Siggi Langauf Sun, 7 Jan 2001 23:59:12 +0100 xine (0.2.2) 2000-10-10 -- cgit v1.2.3 From 6af116eb09411c44ae193e57a2b8c0a3ba3e1f30 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Sat, 6 Mar 2010 19:26:07 +0000 Subject: Add an autoconf flag to allow disabling of the Sun audio sound backend. --- configure.ac | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index b098aaa5f..c84dde126 100644 --- a/configure.ac +++ b/configure.ac @@ -1690,10 +1690,13 @@ AM_CONDITIONAL(HAVE_LIBSMBCLIENT, test "x$have_libsmbclient" = "xyes") dnl --------------------------------------------- dnl SUN style audio interface dnl --------------------------------------------- +AC_ARG_ENABLE([sunaudio], + AS_HELP_STRING([--disable-sunaudio], [Do not build Sun audio output support])) -AC_MSG_CHECKING(for Sun audio support) -have_sunaudio=no -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +if test "x$enable_sunaudio" != "xno"; then + AC_MSG_CHECKING(for Sun audio support) + have_sunaudio=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #include ]], [[ @@ -1702,15 +1705,18 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]])],[ have_sunaudio=yes ],[]) -AC_MSG_RESULT($have_sunaudio) -AM_CONDITIONAL(HAVE_SUNAUDIO, test "x$have_sunaudio" = "xyes") + AC_MSG_RESULT($have_sunaudio) + AM_CONDITIONAL(HAVE_SUNAUDIO, test "x$have_sunaudio" = "xyes") -if test "x$have_sunaudio" = "xyes"; then - dnl NetBSD and OpenBSD don't have this, but check for it - dnl rather than assuming that it doesn't happen elsewhere. - AC_CHECK_MEMBERS([audio_info_t.output_muted]) + if test "x$have_sunaudio" = "xyes"; then + dnl NetBSD and OpenBSD don't have this, but check for it + dnl rather than assuming that it doesn't happen elsewhere. + AC_CHECK_MEMBERS([audio_info_t.output_muted]) + fi fi +AM_CONDITIONAL(HAVE_SUNAUDIO, test "x$have_sunaudio" = "xyes") + dnl --------------------------------------------- dnl IRIX style audio interface -- cgit v1.2.3 From 92a95760af2c9d32daffbedfdc09f89160f029c3 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 6 Mar 2010 19:31:58 +0000 Subject: 1.1.18.1. --- ChangeLog | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d51429d21..275af29fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xine-lib (1.1.18.1) 2010-??-?? +xine-lib (1.1.18.1) 2010-03-06 * Oops. compat.c (for DXR3 support) was omitted. * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. diff --git a/configure.ac b/configure.ac index c84dde126..8e2e970d9 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ XINE_MAJOR=1 XINE_MINOR=1 XINE_SUB=18 dnl XINE_PATCH should be left empty or set to ".1" or ".2" or something similar -XINE_PATCH= +XINE_PATCH=.1 dnl Release series number (usually $XINE_MAJOR.$XINE_MINOR) XINE_SERIES=1.1 -- cgit v1.2.3 From 70a0fbbf48822b53301a63b88bb71072c3e88837 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 6 Mar 2010 20:03:45 +0000 Subject: Added tag 1.1.18.1 for changeset 8b7c25bfb056 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 3e3b3c29d..b5f9dc904 100644 --- a/.hgtags +++ b/.hgtags @@ -152,3 +152,4 @@ ff19463729d8f9bbea35171d641c5f28cdacc7c8 1.1.16.2 fc1aecbb9d80a32d9c802a5208dfdc012f1ba9d5 1.1.16.3 ff764395a361257b11d73583a0e0851e0f5f2ee5 1.1.17 86395fcaded38aca33facf7c8263d23622eea2bd 1.1.18 +8b7c25bfb056ee9b907877b462c132e61112e440 1.1.18.1 -- cgit v1.2.3 From 82083a26798febc8184717d4b6a3eda94fb48925 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Sat, 6 Mar 2010 20:24:13 +0000 Subject: Mention v4l2. --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 8e2e970d9..498e7b851 100644 --- a/configure.ac +++ b/configure.ac @@ -2910,6 +2910,9 @@ fi if test "x$have_v4l" = "xyes"; then echo " - v4l" fi +if test "x$have_v4l2" = "xyes"; then + echo " - v4l2" +fi if test "x$have_libsmbclient" = "xyes"; then echo " - smbclient" fi -- cgit v1.2.3