From c903da3ddf1fe2b8bb58d9304483a0e6c254f387 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 26 Jun 2008 20:33:15 +0100 Subject: Bump version. --- configure.ac | 6 +++--- debian/changelog | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index dd2e6f93c..d8a4f3676 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ dnl XINE_SUB += 1; XINE_PATCH = ''; continue with XINE_LT_* values below dnl XINE_MAJOR=1 XINE_MINOR=1 -XINE_SUB=13 +XINE_SUB=14 dnl XINE_PATCH should be left empty or set to ".1" or ".2" or something similar XINE_PATCH= dnl Release series number (usually $XINE_MAJOR.$XINE_MINOR) @@ -54,9 +54,9 @@ dnl are platform dependent dnl * in Linux, the library will be named dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION -XINE_LT_CURRENT=23 +XINE_LT_CURRENT=24 XINE_LT_REVISION=0 -XINE_LT_AGE=22 +XINE_LT_AGE=23 dnl for a release tarball do "rm .cvsversion" before "make dist" if test -f "${srcdir-.}/.cvsversion"; then diff --git a/debian/changelog b/debian/changelog index b2a4a7fba..e1b6e48cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xine-lib (1.1.13~hg-0) unstable; urgency=low +xine-lib (1.1.14~hg-0) unstable; urgency=low [ Darren Salt ] * Hg snapshot. @@ -7,7 +7,7 @@ xine-lib (1.1.13~hg-0) unstable; urgency=low * remove gs from build-dependencies * change the maintainer field to xine-devel@lists.sourceforge.net. - -- Darren Salt Tue, 08 Apr 2008 15:29:17 +0100 + -- Darren Salt Thu, 26 Jun 2008 20:32:42 +0100 xine-lib (1.1.5~cvs-0) unstable; urgency=low -- cgit v1.2.3 From fc4f11cf8ecb48f2ae2f37cf78a248b790742d96 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 27 Jun 2008 01:46:09 +0100 Subject: Add basic aspect ratio detection for WMV streams. --- ChangeLog | 1 + src/demuxers/asfheader.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++- src/demuxers/asfheader.h | 1 + src/demuxers/demux_asf.c | 8 +++++++ 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cf53fc2a1..33c879b79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ xine-lib (1.1.14) 2008-??-?? XvMC does not support port selection at present. (Backported from the 1.2 branch.) * Fix MPEG TS audio stream problems introduced in 1.1.13. + * Add basic aspect ratio detection for Windows Media Video streams. xine-lib (1.1.13) 2008-06-15 * Security fixes: diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c index 5db25d07f..1b71a0b19 100644 --- a/src/demuxers/asfheader.c +++ b/src/demuxers/asfheader.c @@ -511,6 +511,61 @@ static int asf_header_parse_stream_bitrate_properties(asf_header_t *header_pub, return 1; } +static int asf_header_parse_metadata(asf_header_t *header_pub, uint8_t *buffer, int buffer_len) +{ + asf_header_internal_t *header = (asf_header_internal_t *)header_pub; + asf_reader_t reader; + uint16_t i, records_count; + iconv_t iconv_cd; + + if (buffer_len < 2) + return 0; + + if ((iconv_cd = iconv_open ("UTF-8", "UCS-2LE")) == (iconv_t)-1) + return 0; + + asf_reader_init(&reader, buffer, buffer_len); + asf_reader_get_16(&reader, &records_count); + + for (i = 0; i < records_count; i++) + { + uint16_t index, stream, name_len = 0, data_type; + uint32_t data_len = 0; + int stream_id; + + asf_reader_get_16 (&reader, &index); + asf_reader_get_16 (&reader, &stream); + stream &= 0x7f; + asf_reader_get_16 (&reader, &name_len); + asf_reader_get_16 (&reader, &data_type); + asf_reader_get_32 (&reader, &data_len); + + stream_id = asf_header_get_stream_id (&header->pub, stream); + + if (data_len >= 4) + { + char *name = asf_reader_get_string (&reader, name_len, iconv_cd); + if (!strcmp (name, "AspectRatioX")) + { + asf_reader_get_32 (&reader, &header->pub.aspect_ratios[stream_id].x); + data_len -= 4; + } + else if (!strcmp (name, "AspectRatioY")) + { + asf_reader_get_32 (&reader, &header->pub.aspect_ratios[stream_id].y); + data_len -= 4; + } + free (name); + asf_reader_skip (&reader, data_len); + } + else + asf_reader_skip (&reader, data_len + name_len); + } + + iconv_close (iconv_cd); + return 1; +} + static int asf_header_parse_header_extension(asf_header_t *header, uint8_t *buffer, int buffer_len) { asf_reader_t reader; @@ -549,12 +604,14 @@ static int asf_header_parse_header_extension(asf_header_t *header, uint8_t *buff case GUID_EXTENDED_STREAM_PROPERTIES: asf_header_parse_stream_extended_properties(header, asf_reader_get_buffer(&reader), object_data_length); break; + case GUID_METADATA: + asf_header_parse_metadata(header, asf_reader_get_buffer(&reader), object_data_length); + break; case GUID_ADVANCED_MUTUAL_EXCLUSION: case GUID_GROUP_MUTUAL_EXCLUSION: case GUID_STREAM_PRIORITIZATION: case GUID_BANDWIDTH_SHARING: case GUID_LANGUAGE_LIST: - case GUID_METADATA: case GUID_METADATA_LIBRARY: case GUID_INDEX_PARAMETERS: case GUID_MEDIA_OBJECT_INDEX_PARAMETERS: diff --git a/src/demuxers/asfheader.h b/src/demuxers/asfheader.h index b895a1817..265f0e643 100644 --- a/src/demuxers/asfheader.h +++ b/src/demuxers/asfheader.h @@ -320,6 +320,7 @@ struct asf_header_s { asf_stream_t *streams[ASF_MAX_NUM_STREAMS]; asf_stream_extension_t *stream_extensions[ASF_MAX_NUM_STREAMS]; uint32_t bitrates[ASF_MAX_NUM_STREAMS]; + struct { uint32_t x, y; } aspect_ratios[ASF_MAX_NUM_STREAMS]; }; struct asf_file_s { diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 2b8114a0d..3af265ce4 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -351,6 +351,14 @@ static void asf_send_video_header (demux_asf_t *this, int stream) { BUF_FLAG_FRAME_END; buf->decoder_info[0] = 0; + + if (this->asf_header->aspect_ratios[stream].x && this->asf_header->aspect_ratios[stream].y) + { + buf->decoder_flags |= BUF_FLAG_ASPECT; + buf->decoder_info[1] = bih->biWidth * this->asf_header->aspect_ratios[stream].x; + buf->decoder_info[2] = bih->biHeight * this->asf_header->aspect_ratios[stream].y; + } + buf->size = asf_stream->private_data_length - 11; memcpy (buf->content, bih, buf->size); buf->type = this->streams[stream].buf_type; -- cgit v1.2.3 From 8f7e831eb02574562f0faa71a3b7b6f3068ccd3e Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 29 Jun 2008 14:44:08 +0100 Subject: Missing build-dep. --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index f111cd087..912a800bb 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: xine Developers Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, automake1.9, autoconf, libtool, libavcodec-dev (>= 0.cvs20070307-3) | libavcodeccvs-dev, + libavutil-dev (>= 0.cvs20070307-3) | libavutilcvs-dev, libavformat-dev (>= 0.cvs20070307-3) | libavformatcvs-dev, libpostproc-dev (>= 0.cvs20070307-3) | libpostproccvs-dev, libxcb-xv0-dev | libxv-dev (<< 1:1.0.3), -- cgit v1.2.3 From 6af9ce219741120c355d8b9e53ebba86f4fdfe42 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 29 Jun 2008 18:11:42 +0100 Subject: 1.1.14. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 33c879b79..18e3d7d80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xine-lib (1.1.14) 2008-??-?? +xine-lib (1.1.14) 2008-06-29 * DVB changes: - Reacquire PIDs whenever a PMT is parsed. (Some channels' PIDs are changed on a regular basis.) -- cgit v1.2.3 From d4bb4b19d345ac48f59944bed495f9b9bef60b44 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 29 Jun 2008 18:50:28 +0100 Subject: Build-dep on ghostscript (preferred alternative). --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 912a800bb..3bb868764 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,8 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, libflac-dev, libsdl1.2-dev, libwavpack-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), - zlib1g-dev, w3m, transfig, sgmltools-lite, gs-gpl | gs + zlib1g-dev, w3m, transfig, sgmltools-lite, + ghostscript | gs-gpl | gs Standards-Version: 3.7.2 Package: libxine-dev -- cgit v1.2.3 From 03c2c541ad00f3eb64ac27bf52db58809ba369d8 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 29 Jun 2008 18:50:36 +0100 Subject: Added tag xine-lib-1_1_14-release for changeset 9b383441a18f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9370c6220..490cab4c7 100644 --- a/.hgtags +++ b/.hgtags @@ -70,3 +70,4 @@ b6be674453e922114b55d4613cb197c77d19f094 xine-lib-1_1_9-release 2a2cc543b27b64a6587dfaef4f1d986eb2f2710a xine-lib-1_1_11_1-release 66e1654718fb0581846d60c60bc09ae3b6b8c0cf xine-lib-1_1_12-release 492f87e6963a8d244df32c40d66a6349aabc4420 xine-lib-1_1_13-release +9b383441a18fb49ccd5a07465d3e3db8821cccf6 xine-lib-1_1_14-release -- cgit v1.2.3 From c30a4a18ee3656adab5b9ae5aad92cabfcade372 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 2 Jul 2008 17:56:40 +0100 Subject: fix pthread recursive mutex detection (for mingw32) --- configure.ac | 23 +---------------------- m4/pthreads.m4 | 6 ++++-- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index d8a4f3676..fa141a22a 100644 --- a/configure.ac +++ b/configure.ac @@ -227,28 +227,7 @@ dnl threads and OS specific stuff dnl --------------------------------------------- CC_PTHREAD_FLAGS(, [AC_MSG_ERROR([Pthread support is needed])]) - -dnl -AC_MSG_CHECKING(for recursive mutex support in pthread) -ac_save_LIBS="$LIBS" -LIBS="$LIBS $PTHREAD_LIBS" - -have_recursive_mutex=no -AC_COMPILE_IFELSE(AC_LANG_SOURCE([#include - -int main() { - pthread_mutexattr_t attr; - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - return 0; -} - ]),[ - have_recursive_mutex=yes - ],[ - AC_MSG_ERROR(recursive mutex support is needed - please report) - ]) -LIBS="$ac_save_LIBS" - -AC_MSG_RESULT($have_recursive_mutex) +CC_PTHREAD_RECURSIVE_MUTEX(, [AC_MSG_ERROR([recursive mutex support is needed - please report])]) AC_CHECK_DECL(sysi86,[ AC_DEFINE(HAVE_SYSI86,1,[Define this if the 'sysi86' function is declared in sys/sysi86.h]) diff --git a/m4/pthreads.m4 b/m4/pthreads.m4 index 653a496da..8438cde0b 100644 --- a/m4/pthreads.m4 +++ b/m4/pthreads.m4 @@ -48,7 +48,6 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ [ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS" - LIBS="$LIBS $PTHREAD_LIBS" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -79,7 +78,9 @@ AC_DEFUN([CC_PTHREAD_RECURSIVE_MUTEX], [ AC_CACHE_CHECK( [for recursive mutex support in pthread], [cc_cv_pthread_recursive_mutex], - [ac_save_LIBS="$LIBS" + [ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS" LIBS="$LIBS $PTHREAD_LIBS" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([ @@ -94,6 +95,7 @@ int main() { ], [cc_cv_pthread_recursive_mutex=yes], [cc_cv_pthread_recursive_mutex=no]) + CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" ]) -- cgit v1.2.3 From a441e845377c9791aaa33c3db0a49c25ea7baead Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 2 Jul 2008 17:58:02 +0100 Subject: don't check for ioctl request type if oss audio is not available on mingw32, ioctl does not exist and the AC_IOCTL_REQUEST macro breaks configure As this test is only needed for OSS audio (otherwise it should be somewhere else), it's now only called if OSS audio is actually available --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fa141a22a..2bb0e378c 100644 --- a/configure.ac +++ b/configure.ac @@ -1439,7 +1439,9 @@ if test "x$enable_oss" != "xno"; then #endif ]) - AC_IOCTL_REQUEST + if test "x$have_ossaudio" = "xyes"; then + AC_IOCTL_REQUEST + fi fi AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes") -- cgit v1.2.3 From 9512237d4627c2568be7d1125a1f5cc034ba8377 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 2 Jul 2008 18:01:05 +0100 Subject: provide PTHREAD_CFLAGS when needed --- src/xine-engine/Makefile.am | 4 ++-- src/xine-utils/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 17dd96b10..03176fb80 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/misc/Makefile.common include $(top_srcdir)/lib/Makefile.common -AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE +AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(PTHREAD_CFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = $(ZLIB_CPPFLAGS) $(PTHREAD_CFLAGS) -DXINE_LIBRARY_COMPILE LIBTOOL = $(SHELL) $(top_builddir)/libtool lib_LTLIBRARIES = libxine.la diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 6af0d29bd..a599f9b12 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -12,7 +12,7 @@ endif endif AM_CFLAGS = $(X_CFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS=-DXINE_LIBRARY_COMPILE +AM_CPPFLAGS= $(PTHREAD_CFLAGS) -DXINE_LIBRARY_COMPILE libxineutils_la_SOURCES = $(pppc_files) \ cpu_accel.c \ -- cgit v1.2.3 From 4d9268deac1c4755343b392f9dd18ec30753444d Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 2 Jul 2008 18:10:01 +0100 Subject: Cope with missing strcasestr(). --- configure.ac | 2 +- lib/os_internal.h | 7 +++++++ lib/strcasestr.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 lib/strcasestr.c diff --git a/configure.ac b/configure.ac index 2bb0e378c..89595225a 100644 --- a/configure.ac +++ b/configure.ac @@ -2129,7 +2129,7 @@ if test "x$some_snprintf" != "xyes" -o \ fi AC_FUNC_FSEEKO AC_CHECK_HEADERS(assert.h byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h netdb.h dirent.h sys/times.h sys/ioctl.h sys/param.h alloca.h) -AC_REPLACE_FUNCS(asprintf basename gettimeofday setenv strndup strpbrk strsep strtok_r timegm unsetenv memmem) +AC_REPLACE_FUNCS(asprintf basename gettimeofday setenv strcasestr strndup strpbrk strsep strtok_r timegm unsetenv memmem) AC_LIBSOURCE(hstrerror.c) AC_LINK_IFELSE([#include diff --git a/lib/os_internal.h b/lib/os_internal.h index 6e6e14a3d..968b8f02f 100644 --- a/lib/os_internal.h +++ b/lib/os_internal.h @@ -65,6 +65,13 @@ const char *xine_private_hstrerror(int err); int xine_private_setenv(const char *name, const char *value); #endif +/* replacement of strcasestr */ +#ifndef HAVE_STRCASESTR +#define HAVE_STRCASESTR +#define strcasestr(HAYSTACK, NEEDLE) xine_private_strcasestr((HAYSTACK), (NEEDLE)) +char *xine_private_strcasestr(const char *haystack, const char *needle); +#endif + /* replacement of strtok_r */ #ifndef HAVE_STRTOK_R #define HAVE_STRTOK_R diff --git a/lib/strcasestr.c b/lib/strcasestr.c new file mode 100644 index 000000000..0793319aa --- /dev/null +++ b/lib/strcasestr.c @@ -0,0 +1,60 @@ +/*- + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "config.h" + +#include +#include +#include + +/* + * Find the first occurrence of find in s, ignore case. + */ +char * +xine_private_strcasestr(const char *s, const char *find) +{ + char c, sc; + size_t len; + + if ((c = *find++) != 0) { + c = tolower((unsigned char)c); + len = strlen(find); + do { + do { + if ((sc = *s++) == 0) + return (NULL); + } while ((char)tolower((unsigned char)sc) != c); + } while (strncasecmp(s, find, len) != 0); + s--; + } + return (char *)s; +} -- cgit v1.2.3 From 205eafe1f8ac38e8dfee646a19b86032e1b112f6 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 2 Jul 2008 19:06:27 +0100 Subject: Bump version ready for the next release. Hopefully, that's a while away yet :-) --- ChangeLog | 2 ++ configure.ac | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18e3d7d80..189d9a589 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +xine-lib (1.1.15) 2008-??-?? + xine-lib (1.1.14) 2008-06-29 * DVB changes: - Reacquire PIDs whenever a PMT is parsed. (Some channels' PIDs are diff --git a/configure.ac b/configure.ac index 89595225a..e15311cdf 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ dnl XINE_SUB += 1; XINE_PATCH = ''; continue with XINE_LT_* values below dnl XINE_MAJOR=1 XINE_MINOR=1 -XINE_SUB=14 +XINE_SUB=15 dnl XINE_PATCH should be left empty or set to ".1" or ".2" or something similar XINE_PATCH= dnl Release series number (usually $XINE_MAJOR.$XINE_MINOR) @@ -54,9 +54,9 @@ dnl are platform dependent dnl * in Linux, the library will be named dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION -XINE_LT_CURRENT=24 +XINE_LT_CURRENT=25 XINE_LT_REVISION=0 -XINE_LT_AGE=23 +XINE_LT_AGE=24 dnl for a release tarball do "rm .cvsversion" before "make dist" if test -f "${srcdir-.}/.cvsversion"; then -- cgit v1.2.3 From 4bec128b08b0b1fb42d482ac6fb802ab98aa556d Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Wed, 2 Jul 2008 12:21:43 +0100 Subject: Don't segfault when the user requests an input the card doesn't posess. --- ChangeLog | 1 + src/input/input_v4l.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 189d9a589..3edadc2a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ xine-lib (1.1.15) 2008-??-?? + * V4L: Don't segfault if asked for an input that doesn't exist xine-lib (1.1.14) 2008-06-29 * DVB changes: diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 29ed9899b..00c579c44 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1608,7 +1608,8 @@ static void v4l_plugin_dispose (input_plugin_t *this_gen) { data. */ free(this->audio_content_base); free(this->video_content_base); - free(this->frames_base->extra_info); + if (this->frames_base) + free(this->frames_base->extra_info); free(this->frames_base); #ifdef LOG -- cgit v1.2.3 From 2b0e330c2642081066316ca5ec9965912cd248de Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Wed, 2 Jul 2008 19:30:39 +0100 Subject: Build fix for external ffmpeg --- src/post/planar/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 36405bfc2..c49243252 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -4,7 +4,7 @@ POSTPROC_INT_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostp if HAVE_FFMPEG postproc_lib = $(FFMPEG_POSTPROC_LIBS) -ff_cflags = $(FFMPEG_POSTPROC_CFLAGS) +ff_cflags = $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) else ff_cflags = -I$(top_srcdir)/src/libffmpeg/libavcodec postproc_lib = $(POSTPROC_INT_LIB) -- cgit v1.2.3