From 562bd086cd03e692711fe99218ddb027039ca978 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 18 Nov 2011 18:21:03 +0000 Subject: Enhance and move the "internal ffmpeg" warning. --HG-- branch : point-release --- configure.ac | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 6af7ef7c1..7301c0ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -372,14 +372,7 @@ if test "x$with_external_ffmpeg" != "xno"; then AC_MSG_RESULT([using external ffmpeg]) else - AC_MSG_NOTICE([ -********************************************************************* -xine-lib is configured to use internal ffmpeg. - -This copy of ffmpeg is old. You are strongly advised to install a -newer version (including development files) and to reconfigure -xine-lib to use it. -*********************************************************************]) + AC_MSG_RESULT([using internal ffmpeg - NOT RECOMMENDED OR SUPPORTED]) LIBFFMPEG_CPPFLAGS="-DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DXINE_MPEG_ENCODER -D_ISOC9X_SOURCE -DCONFIG_DECODERS" AC_CHECK_TYPES(int_fast8_t, [], [LIBFFMPEG_CPPFLAGS="$LIBFFMPEG_CPPFLAGS -DEMULATE_FAST_INT"]) AC_SUBST([LIBFFMPEG_CPPFLAGS]) @@ -3367,3 +3360,18 @@ if test "x$no_x" = "xyes"; then ;; esac fi + +dnl warn if internal ffmpeg is being used +if test "x$with_external_ffmpeg" = "xno"; then + AC_MSG_NOTICE([ +********************************************************************* +xine-lib is configured to use internal ffmpeg. + +This copy of ffmpeg is old and has known security problems. +Don't use it. We don't want you to. We only care that xine-lib is +compilable with it; beyond that, you're completely on your own. + +You are STRONGLY advised to install a newer version (including +development files) and to reconfigure xine-lib to use it. +*********************************************************************]) +fi -- cgit v1.2.3 From a370ac90bb79945104809aeb3c331aaa1145e516 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 18 Nov 2011 18:44:38 +0000 Subject: Changelog update. --HG-- branch : point-release --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 220828e1e..fa5ac44cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +xine-lib (1.1.20.1) 2011-??-?? + * Various bug fixes. + xine-lib (1.1.20) 2011-11-13 * Imagine that there's a large poppy here. * Ensure that file and socket descriptors are marked as CLOEXEC. -- cgit v1.2.3 From d1355065fbe275296fee39a75fe4fabb6950401b Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 05:51:21 +0100 Subject: fix system libdvdnav support to also link libdvdread --HG-- branch : point-release --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 7301c0ee1..c88bd2592 100644 --- a/configure.ac +++ b/configure.ac @@ -1766,6 +1766,7 @@ if test "x$external_dvdnav" = "xyes"; then AM_PATH_DVDNAV(0.1.9, AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]), [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) + AC_CHECK_LIB(dvdread, navRead_DSI, DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread",) else AC_MSG_RESULT([Use included DVDNAV support]) fi -- cgit v1.2.3 From 35de4d1c31809b47059ec0bf038f803aae449d12 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 22 Nov 2011 21:12:14 +0200 Subject: Use current ImageMagick API --HG-- branch : point-release extra : transplant_source : %3F%D8u%A8%97%F1R%3FtU%27%CB%EA%F5%26%18%EC-%C6%9E --- src/libxinevdec/image.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index d5a9cfff5..d8064d200 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -101,14 +101,23 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { /* * this->image -> rgb data */ +#if !defined(MagickLibVersion) || MagickLibVersion < 0x671 InitializeMagick(NULL); +#else + MagickWandGenesis(); +#endif wand = NewMagickWand(); status = MagickReadImageBlob(wand, this->image, this->index); + this->index = 0; if (!status) { DestroyMagickWand(wand); +#if !defined(MagickLibVersion) || MagickLibVersion < 0x671 DestroyMagick(); +#else + MagickWandTerminus(); +#endif lprintf("error loading image\n"); return; } @@ -116,9 +125,15 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */ height = MagickGetImageHeight(wand); img_buf = malloc(width * height * 3); +#if !defined(MagickLibVersion) || MagickLibVersion < 0x671 MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); DestroyMagickWand(wand); DestroyMagick(); +#else + MagickExportImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); + DestroyMagickWand(wand); + MagickWandTerminus(); +#endif _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width); _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, height); -- cgit v1.2.3 From cb766fad28e81704d6408aab27beacd976cd1731 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 22 Nov 2011 22:10:01 +0000 Subject: Fix up ImageMagick API selection in the presence of GraphicsMagick; changelog. --HG-- branch : point-release --- ChangeLog | 1 + configure.ac | 3 ++- src/libxinevdec/image.c | 17 ++++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa5ac44cc..65fa30ad1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ xine-lib (1.1.20.1) 2011-??-?? * Various bug fixes. + * Use the current ImageMagick API (if using ImageMagick). xine-lib (1.1.20) 2011-11-13 * Imagine that there's a large poppy here. diff --git a/configure.ac b/configure.ac index c88bd2592..f18288691 100644 --- a/configure.ac +++ b/configure.ac @@ -1426,11 +1426,12 @@ if test "x$with_imagemagick" != "xno"; then dnl the flags for plain GraphicsMagick WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS" WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS" + AC_DEFINE([HAVE_GRAPHICSMAGICK], [1], [Define this if you have GraphicsMagick installed]) fi if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found]) elif test "x$have_imagemagick" = "xyes"; then - AC_DEFINE([HAVE_WAND], [1], [Define this if you have ImageMagick installed]) + AC_DEFINE([HAVE_WAND], [1], [Define this if you have ImageMagick or GraphicsMagick's compat layer installed]) fi fi diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index d8064d200..5e166382b 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -54,6 +54,17 @@ #include "xineutils.h" #include "bswap.h" +#ifdef HAVE_GRAPHICSMAGICK +# define MAGICK_VERSION 0x670 +#else +# if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +# define MAGICK_VERSION 0x670 +#else +# define MAGICK_VERSION MagickLibVersion +# endif +#endif + + typedef struct { video_decoder_class_t decoder_class; @@ -101,7 +112,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { /* * this->image -> rgb data */ -#if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +#if MAGICK_VERSION < 0x671 InitializeMagick(NULL); #else MagickWandGenesis(); @@ -113,7 +124,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { if (!status) { DestroyMagickWand(wand); -#if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +#if MAGICK_VERSION < 0x671 DestroyMagick(); #else MagickWandTerminus(); @@ -125,7 +136,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */ height = MagickGetImageHeight(wand); img_buf = malloc(width * height * 3); -#if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +#if MAGICK_VERSION < 0x671 MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); DestroyMagickWand(wand); DestroyMagick(); -- cgit v1.2.3