From 4edc2d3b758cb4348cfe2115707be54d71f5fce8 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 8 Jun 2012 15:01:17 +0100 Subject: Changelog update. --- ChangeLog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06c35fdb5..dda6b1ee3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,15 @@ xine-lib (1.1.21) ????-??-?? - * mpeg-ts fixes and enhancements + * Fix matroska header compression. + * MPEG-TS fixes and enhancements * Improved syncing of DVB subtitles * BluRay support (requires libbluray) * Fix full range YUV (with ffmpeg codecs) * Fix multithreading with recent ffmpeg versions * Fix cropping with ffmpeg codecs * Fix OSD when using OpenGL video output - -xine-lib (1.1.20.2) ????-??-?? + * xine-list no longer causes catalog.cache to be written. + * Windows-related (cygwin, mingw) build fixes. * Various bug fixes. - * Fix matroska header compression. xine-lib (1.1.20.1) 2012-01-01 * Various bug fixes. -- cgit v1.2.3 From 7d997a77166b94aea43afbbc252f1aa0af00a7fa Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 9 Jun 2012 17:09:49 +0100 Subject: Double-free with some AAC files (missing check). --- ChangeLog | 1 + src/libfaad/xine_faad_decoder.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dda6b1ee3..16ba11b74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ xine-lib (1.1.21) ????-??-?? + * Fix a potential double-free (goom) when playing AAC files. * Fix matroska header compression. * MPEG-TS fixes and enhancements * Improved syncing of DVB subtitles diff --git a/src/libfaad/xine_faad_decoder.c b/src/libfaad/xine_faad_decoder.c index 86dc7d6d3..af0c6f967 100644 --- a/src/libfaad/xine_faad_decoder.c +++ b/src/libfaad/xine_faad_decoder.c @@ -249,8 +249,10 @@ static void faad_decode_audio ( faad_decoder_t *this, int end_frame ) { lprintf("faacDecDecode() returned rate=%"PRId32" channels=%d used=%d\n", this->rate, this->num_channels, used); - this->stream->audio_out->close (this->stream->audio_out, this->stream); - this->output_open = 0; + if (this->output_open) { + this->stream->audio_out->close (this->stream->audio_out, this->stream); + this->output_open = 0; + } faad_open_output( this ); faad_meta_info_set( this ); -- cgit v1.2.3 From 8eae9306239d6683d7cd06bf92be02bbd1c43865 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 9 Jun 2012 15:38:03 +0100 Subject: Fix a possible NULL dereference when cleaning up in the FFT vis plugin code. --- ChangeLog | 1 + src/post/visualizations/fft.c | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16ba11b74..9e765ed92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ xine-lib (1.1.21) ????-??-?? * Fix a potential double-free (goom) when playing AAC files. + * Fix a possible clean-up crash in the goom FFT code. * Fix matroska header compression. * MPEG-TS fixes and enhancements * Improved syncing of DVB subtitles diff --git a/src/post/visualizations/fft.c b/src/post/visualizations/fft.c index 7e32dbbf6..ac109e379 100644 --- a/src/post/visualizations/fft.c +++ b/src/post/visualizations/fft.c @@ -153,10 +153,13 @@ fft_t *fft_new (int bits) void fft_dispose(fft_t *fft) { - free(fft->SineTable); - free(fft->CosineTable); - free(fft->WinTable); - free(fft); + if (fft) + { + free(fft->SineTable); + free(fft->CosineTable); + free(fft->WinTable); + free(fft); + } } /* -- cgit v1.2.3 From 5f5e4800790e0539e8df5d8449e599236ad0116c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 9 Jun 2012 17:15:05 +0100 Subject: Correct detection of AAC ADIF. --- src/demuxers/demux_aac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index 0ac645b78..eb12c065e 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -95,7 +95,7 @@ static int open_aac_file(demux_aac_t *this) { return 0; /* Check for an ADIF header - should be at the start of the file */ - if (_x_is_fourcc(peak, "AIDF")) { + if (_x_is_fourcc(peak, "ADIF")) { lprintf("found ADIF header\n"); return 1; } -- cgit v1.2.3 From 9f1eb4a63fc25a5f46c64d2c374d005eb692e2ee Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 9 Jun 2012 18:17:31 +0100 Subject: Bump shlib version (compatible); release. --- ChangeLog | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e765ed92..f60e0f43f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xine-lib (1.1.21) ????-??-?? +xine-lib (1.1.21) 2012-06-09 * Fix a potential double-free (goom) when playing AAC files. * Fix a possible clean-up crash in the goom FFT code. * Fix matroska header compression. diff --git a/configure.ac b/configure.ac index 656904649..9112b583f 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ dnl * for GNU/Linux, the library will be named dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION XINE_LT_CURRENT=31 -XINE_LT_REVISION=1 +XINE_LT_REVISION=2 XINE_LT_AGE=30 dnl for a release tarball do "rm .cvsversion" before "make dist" -- cgit v1.2.3