diff options
Diffstat (limited to 'media-video')
7 files changed, 11 insertions, 470 deletions
diff --git a/media-video/cinelerra-cvs/ChangeLog b/media-video/cinelerra-cvs/ChangeLog index b2a630571e8d..0712db24f18d 100644 --- a/media-video/cinelerra-cvs/ChangeLog +++ b/media-video/cinelerra-cvs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/cinelerra-cvs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.45 2008/06/03 13:31:17 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.46 2008/06/21 13:11:16 hanno Exp $ + + 21 Jun 2008; Hanno Boeck <hanno@gentoo.org> + -files/cinelerra-cvs-gcc-4.3.patch, -files/cinelerra-compilewarnings.diff, + -files/cinelerra-cvs-ffmpegheaders.patch, + -files/cinelerra-cvs-swscaler.patch, -cinelerra-cvs-20080401.ebuild: + Remove upstream-applied patches and old ebuild. *cinelerra-cvs-20080602 (03 Jun 2008) diff --git a/media-video/cinelerra-cvs/Manifest b/media-video/cinelerra-cvs/Manifest index 272a860b4827..c1e9a39e29c4 100644 --- a/media-video/cinelerra-cvs/Manifest +++ b/media-video/cinelerra-cvs/Manifest @@ -1,21 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX cinelerra-compilewarnings.diff 1424 RMD160 0c801e2cfc778a76681b7a976e47d18f0d8bb75a SHA1 c052d67f9de343189a2e63cf763c48644b42328e SHA256 387ee6e80a0e1f2905d27ba204fb2bda3753f16aa45bc7a16b82d6d51ad462d5 AUX cinelerra-cvs-defaultx264tocqp.patch 405 RMD160 a89e2be0b15581d880a4cc086fcd9f233ee97391 SHA1 88810ed033a030f48e0264b48dd28526ad517698 SHA256 13082a69d87805cd743fc2fe7eae66e16a87eba763e17524da3b03a23d1483ac -AUX cinelerra-cvs-ffmpegheaders.patch 3132 RMD160 9d956728f98163a8c7b499e0b4857b651101dae8 SHA1 c9b5f3adae2e298e6b59cab5b1f356155a689c60 SHA256 bce0b929743f0b04905194358f9e365d0e84bdb2bdc6957b51d71578ab54ff8a -AUX cinelerra-cvs-gcc-4.3.patch 345 RMD160 fe8424391996f675c6c8b46ad1d228a499f35c64 SHA1 029a6d2f8424bc08b6e6835a0f2f3fab92e98eb5 SHA256 3bc9928478810e46a3e95f980ff91a6d27099253b86109091274cea3fe53cee1 -AUX cinelerra-cvs-swscaler.patch 5012 RMD160 8ebc7520dc58b96fbe903964a05b5884b496ee90 SHA1 a0d15e358b5bdebc05194eb0966b98c25ec00d19 SHA256 acae0382cd23e8b4371151e5084aa0e0873f9e1c405f90fd7f2487fbb393ceb6 -DIST cinelerra-cvs-20080401.tar.bz2 31224957 RMD160 11cb28bc042309afe2890c17ea912e633b5c897c SHA1 a69d85b9f083e8f7804caaf206a7ee3b17f87960 SHA256 26b2b16538fb615dadd1302129011b25abe936eb8120d5aec99f9dbf991307cf DIST cinelerra-cvs-20080602.tar.bz2 31256213 RMD160 968c32120c259e12707848763ea90f4030beb3ef SHA1 75d34bdac01e6f5f6702d3d2321fd43c4788029f SHA256 686ce3f100f8e01d5b1eac67cef59dcc5e6be4953f8dc16f756bd94217be145a -EBUILD cinelerra-cvs-20080401.ebuild 3059 RMD160 26e5b002c89185a1a8b1a59cd2147148694a42ee SHA1 758fb1c6080af9ca1cd451c58cb144206cbfde93 SHA256 2a438f8e621bbd62054ceb53bd0354eca7a1b16044775f5d4a54b9ef7f1e67a7 EBUILD cinelerra-cvs-20080602.ebuild 2875 RMD160 7c64f19c80af35777b4ec12a00daaea443f4bca3 SHA1 e08d9b9fc58909b0f92686481aa0fc2717e4325c SHA256 d0a15626fb86460c194ed37b9b1263e24887ec7f261317ed29ba0e7e7968dc06 -MISC ChangeLog 7504 RMD160 6c1069f2b4cf65c3ad78d4333a61516ec14a4fb4 SHA1 b5e9b3b4ce647dda1a4f9121e53d8e13020ee3d7 SHA256 0dd149609cb911a4c655b66ec1c455ac3dbb9b522c418d04b2a904b181a0a44e +MISC ChangeLog 7793 RMD160 109acbf3b0088b0c96e9fc01ed4c43ad51c253b1 SHA1 bb2bba5425057f0ec145db8a448ef06904643003 SHA256 5e6b34615884efe423a4ca7416d36349881a0f2632d9de617ffd5a5b0cccfed3 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkhFR68ACgkQr2QksT29OyBPAQCeMCNyfY2RC9sx9vnKRXaIJfnM -d6cAoJfpx2EqL14DSlcj5WI4WhGc9/K2 -=UA/w +iEYEARECAAYFAkhc/gAACgkQr2QksT29OyBuKgCdHNPUNYtdIBnV7td/8f0luEOy +sacAn0W2KlP3dygRYVqZbgM969alhSX6 +=CxqV -----END PGP SIGNATURE----- diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20080401.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20080401.ebuild deleted file mode 100644 index 744e6645279e..000000000000 --- a/media-video/cinelerra-cvs/cinelerra-cvs-20080401.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20080401.ebuild,v 1.2 2008/04/07 22:07:31 yngwin Exp $ - -WANT_AUTOMAKE=1.9 -WANT_AUTOCONF=2.5 - -inherit toolchain-funcs eutils flag-o-matic autotools - -#filter-flags "-fPIC -fforce-addr" - -DESCRIPTION="Cinelerra - Professional Video Editor - Unofficial CVS-version" -HOMEPAGE="http://cvs.cinelerra.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="3dnow alsa esd mmx oss static truetype ieee1394 css altivec opengl" -RDEPEND="media-libs/libpng - >=media-libs/libdv-1.0.0 - media-libs/faad2 - media-libs/faac - media-libs/a52dec - media-libs/libsndfile - media-libs/tiff - media-video/ffmpeg - media-sound/lame - >=sci-libs/fftw-3.0.1 - media-libs/x264 - ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 \ - >=sys-libs/libavc1394-0.5.0 ) - media-video/mjpegtools - alsa? ( media-libs/alsa-lib ) - esd? ( >=media-sound/esound-0.2.34 ) - truetype? ( >=media-libs/freetype-2.1.10 ) - opengl? ( virtual/opengl ) - >=media-libs/openexr-1.2.2 - >=media-libs/libvorbis-1.1.0 - >=media-libs/libogg-1.1 - >=media-libs/libtheora-1.0_alpha4-r1 - x11-libs/libX11 - x11-libs/libXv - x11-libs/libXxf86vm - x11-libs/libXext - x11-libs/libXvMC - x11-libs/libXft" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - x86? ( dev-lang/nasm )" - -S="${WORKDIR}/${PN}" - -pkg_setup() { - if [[ "$(gcc-major-version)" -lt "4" ]]; then - eerror "You need to have gcc 4 or better" - eerror "Please follow : http://www.gentoo.org/doc/en/gcc-upgrading.xml" - eerror "And have a look at bug #128659" - die "You must use gcc 4 or better." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-swscaler.patch" - epatch "${FILESDIR}/cinelerra-compilewarnings.diff" - epatch "${FILESDIR}/${PN}-defaultx264tocqp.patch" - epatch "${FILESDIR}/${PN}-gcc-4.3.patch" - epatch "${FILESDIR}/${PN}-ffmpegheaders.patch" - AT_M4DIR="m4" eautoreconf -} - -src_compile() { - econf \ - `use_enable static` \ - `use_enable alsa` \ - `use_enable esd` \ - `use_enable oss` \ - `use_enable mmx` \ - `use_enable 3dnow` \ - --with-plugindir=/usr/$(get_libdir)/cinelerra \ - `use_enable truetype freetype2` \ - `use_enable ieee1394 firewire` \ - `use_enable css` \ - `use_enable opengl` \ - `use_enable altivec` \ - --with-external-ffmpeg \ - --with-buildinfo=cust/"Gentoo - SVN r1055" \ - || die "configure failed" - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die - dohtml -a png,html,texi,sdw -r doc/* - # workaround - rm -fR "${D}/usr/include" - mv "${D}/usr/bin/mpeg3cat" "${D}/usr/bin/mpeg3cat.hv" - mv "${D}/usr/bin/mpeg3dump" "${D}/usr/bin/mpeg3dump.hv" - mv "${D}/usr/bin/mpeg3toc" "${D}/usr/bin/mpeg3toc.hv" - ln -s /usr/bin/mpeg2enc "${D}/usr/$(get_libdir)/cinelerra/mpeg2enc.plugin" -} - -pkg_postinst () { - elog "Please note that this is unofficial and somewhat experimental code." - elog "See cvs.cinelerra.org for a list of changes to the official cinelerra" - elog "release." -} diff --git a/media-video/cinelerra-cvs/files/cinelerra-compilewarnings.diff b/media-video/cinelerra-cvs/files/cinelerra-compilewarnings.diff deleted file mode 100644 index 1e77b03a4011..000000000000 --- a/media-video/cinelerra-cvs/files/cinelerra-compilewarnings.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- cinelerra-cvs/libmpeg3/audio/mpeg3audio.c 2007-01-29 22:36:44.000000000 +0100 -+++ cinelerra-cvs-1/libmpeg3/audio/mpeg3audio.c 2007-07-31 21:13:30.000000000 +0200 -@@ -3,7 +3,7 @@ - - #include <math.h> - #include <stdlib.h> -- -+#include <string.h> - - - ---- cinelerra-cvs/libmpeg3/video/subtitle.c 2007-01-29 22:36:48.000000000 +0100 -+++ cinelerra-cvs-1/libmpeg3/video/subtitle.c 2007-07-31 21:15:47.000000000 +0200 -@@ -2,6 +2,7 @@ - #include "mpeg3protos.h" - - #include <stdlib.h> -+#include <string.h> - - static unsigned char get_nibble(unsigned char **ptr, int *nibble) - { ---- cinelerra-cvs/quicktime/interlacemodes.c 2007-01-29 22:35:57.000000000 +0100 -+++ cinelerra-cvs-1/quicktime/interlacemodes.c 2007-07-31 21:18:22.000000000 +0200 -@@ -17,6 +17,7 @@ - - #include <stdlib.h> - #include <stdint.h> -+#include <string.h> - - #ifndef HAVE_STDINT_H - #define HAVE_STDINT_H ---- cinelerra-cvs/mpeg2enc/putbits.c 2007-01-29 22:36:44.000000000 +0100 -+++ cinelerra-cvs-1/mpeg2enc/putbits.c 2007-07-31 21:19:40.000000000 +0200 -@@ -28,6 +28,7 @@ - */ - - #include <stdio.h> -+#include <string.h> - #include "config.h" - #include "global.h" - ---- cinelerra-cvs/mpeg2enc/readpic.c 2007-01-29 22:36:44.000000000 +0100 -+++ cinelerra-cvs-1/mpeg2enc/readpic.c 2007-07-31 21:20:31.000000000 +0200 -@@ -29,6 +29,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include "colormodels.h" - #include "config.h" - #include "global.h" diff --git a/media-video/cinelerra-cvs/files/cinelerra-cvs-ffmpegheaders.patch b/media-video/cinelerra-cvs/files/cinelerra-cvs-ffmpegheaders.patch deleted file mode 100644 index 5cc57f887284..000000000000 --- a/media-video/cinelerra-cvs/files/cinelerra-cvs-ffmpegheaders.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: cinelerra-cvs/cinelerra/ffmpeg.h -=================================================================== ---- cinelerra-cvs.orig/cinelerra/ffmpeg.h -+++ cinelerra-cvs/cinelerra/ffmpeg.h -@@ -1,11 +1,20 @@ - #ifndef FFMPEG_H - #define FFMPEG_H - -+#include "config.h" - extern "C" { -+#if HAVE_LIBAVCODEC_AVCODEC_H -+#include <libavcodec/avcodec.h> -+#else - #include <avcodec.h> -+#endif - #ifdef HAVE_SWSCALER -+#if HAVE_LIBSWSCALE_SWSCALE_H -+#include <libswscale/swscale.h> -+#else - #include <swscale.h> - #endif -+#endif - }; - - #include "asset.h" -Index: cinelerra-cvs/cinelerra/fileac3.h -=================================================================== ---- cinelerra-cvs.orig/cinelerra/fileac3.h -+++ cinelerra-cvs/cinelerra/fileac3.h -@@ -1,8 +1,13 @@ - #ifndef FILEAC3_H - #define FILEAC3_H - -+#include "config.h" - extern "C" { -+#if HAVE_LIBAVCODEC_AVCODEC_H -+#include <libavcodec/avcodec.h> -+#else - #include <avcodec.h> -+#endif - }; - - #include "filebase.h" -Index: cinelerra-cvs/configure.in -=================================================================== ---- cinelerra-cvs.orig/configure.in -+++ cinelerra-cvs/configure.in -@@ -370,6 +370,10 @@ if test "x$with_external_ffmpeg" = "xyes - else - PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc]) - fi -+ AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) -+ AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) -+ AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) -+ AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h]) - - else - FFMPEG_FOLDER=ffmpeg -Index: cinelerra-cvs/quicktime/mpeg4.c -=================================================================== ---- cinelerra-cvs.orig/quicktime/mpeg4.c -+++ cinelerra-cvs/quicktime/mpeg4.c -@@ -7,7 +7,12 @@ - - - -+#include "config.h" -+#if HAVE_LIBAVCODEC_AVCODEC_H -+#include <libavcodec/avcodec.h> -+#else - #include "avcodec.h" -+#endif - #include "colormodels.h" - #include "funcprotos.h" - #include "qtffmpeg.h" -Index: cinelerra-cvs/quicktime/qtffmpeg.h -=================================================================== ---- cinelerra-cvs.orig/quicktime/qtffmpeg.h -+++ cinelerra-cvs/quicktime/qtffmpeg.h -@@ -16,8 +16,12 @@ - // Heroine Virtual. - - -- -+#include "config.h" -+#if HAVE_LIBAVCODEC_AVCODEC_H -+#include <libavcodec/avcodec.h> -+#else - #include "avcodec.h" -+#endif - #include "qtprivate.h" - - -Index: cinelerra-cvs/quicktime/qth264.c -=================================================================== ---- cinelerra-cvs.orig/quicktime/qth264.c -+++ cinelerra-cvs/quicktime/qth264.c -@@ -1,4 +1,9 @@ -+#include "config.h" -+#if HAVE_LIBAVCODEC_AVCODEC_H -+#include <libavcodec/avcodec.h> -+#else - #include "avcodec.h" -+#endif - #include "colormodels.h" - #include "funcprotos.h" - #include <pthread.h> -Index: cinelerra-cvs/quicktime/wma.c -=================================================================== ---- cinelerra-cvs.orig/quicktime/wma.c -+++ cinelerra-cvs/quicktime/wma.c -@@ -1,4 +1,9 @@ -+#include "config.h" -+#if HAVE_LIBAVCODEC_AVCODEC_H -+#include <libavcodec/avcodec.h> -+#else - #include "avcodec.h" -+#endif - #include "funcprotos.h" - #include "quicktime.h" - #include <string.h> diff --git a/media-video/cinelerra-cvs/files/cinelerra-cvs-gcc-4.3.patch b/media-video/cinelerra-cvs/files/cinelerra-cvs-gcc-4.3.patch deleted file mode 100644 index e244a2deafaf..000000000000 --- a/media-video/cinelerra-cvs/files/cinelerra-cvs-gcc-4.3.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- plugins/threshold/threshold.C -+++ plugins/threshold/threshold.C -@@ -461,13 +461,13 @@ - } - - template<> --static inline float scale_to_range(int v) -+inline float scale_to_range(int v) - { - return (float) v / 0xff; - } - - template<> --static inline uint16_t scale_to_range(int v) -+inline uint16_t scale_to_range(int v) - { - return v << 8 | v; - } diff --git a/media-video/cinelerra-cvs/files/cinelerra-cvs-swscaler.patch b/media-video/cinelerra-cvs/files/cinelerra-cvs-swscaler.patch deleted file mode 100644 index 255ce4dd9f2b..000000000000 --- a/media-video/cinelerra-cvs/files/cinelerra-cvs-swscaler.patch +++ /dev/null @@ -1,159 +0,0 @@ -Index: cinelerra-cvs/cinelerra/ffmpeg.C -=================================================================== ---- cinelerra-cvs.orig/cinelerra/ffmpeg.C -+++ cinelerra-cvs/cinelerra/ffmpeg.C -@@ -140,6 +140,11 @@ int FFMPEG::convert_cmodel(VFrame *frame - PixelFormat pix_fmt_out = - color_model_to_pix_fmt(frame_out->get_color_model()); - -+#ifdef HAVE_SWSCALER -+ // We need a context for swscale -+ struct SwsContext *convert_ctx; -+#endif -+ - // do conversion within libavcodec if possible - if (pix_fmt_in != PIX_FMT_NB && pix_fmt_out != PIX_FMT_NB) { - // set up a temporary pictures from frame_in and frame_out -@@ -147,7 +152,9 @@ int FFMPEG::convert_cmodel(VFrame *frame - init_picture_from_frame(&picture_in, frame_in); - init_picture_from_frame(&picture_out, frame_out); - -- int result = img_convert(&picture_out, -+ int result; -+#ifndef HAVE_SWSCALER -+ result = img_convert(&picture_out, - pix_fmt_out, - &picture_in, - pix_fmt_in, -@@ -156,6 +163,28 @@ int FFMPEG::convert_cmodel(VFrame *frame - if (result) { - printf("FFMPEG::convert_cmodel img_convert() failed\n"); - } -+#else -+ convert_ctx = sws_getContext(frame_in->get_w(), frame_in->get_h(),pix_fmt_in, -+ frame_out->get_w(),frame_out->get_h(),pix_fmt_out, -+ SWS_BICUBIC, NULL, NULL, NULL); -+ -+ if(convert_ctx == NULL){ -+ printf("FFMPEG::convert_cmodel : swscale context initialization failed\n"); -+ return 1; -+ } -+ -+ result = sws_scale(convert_ctx, -+ picture_in.data, picture_in.linesize, -+ 0, 0, -+ picture_out.data, picture_out.linesize); -+ -+ -+ sws_freeContext(convert_ctx); -+ -+ if(result){ -+ printf("FFMPEG::convert_cmodel sws_scale() failed\n"); -+ } -+#endif - return result; - } - -@@ -203,13 +232,19 @@ int FFMPEG::convert_cmodel(AVPicture *pi - - // set up a temporary picture_out from frame_out - AVPicture picture_out; -+#ifdef HAVE_SWSCALER -+ // We need a context for swscale -+ struct SwsContext *convert_ctx; -+#endif - init_picture_from_frame(&picture_out, frame_out); - int cmodel_out = frame_out->get_color_model(); - PixelFormat pix_fmt_out = color_model_to_pix_fmt(cmodel_out); - - // do conversion within libavcodec if possible - if (pix_fmt_out != PIX_FMT_NB) { -- int result = img_convert(&picture_out, -+ int result; -+#ifndef HAVE_SWSCALER -+ result = img_convert(&picture_out, - pix_fmt_out, - picture_in, - pix_fmt_in, -@@ -218,6 +253,28 @@ int FFMPEG::convert_cmodel(AVPicture *pi - if (result) { - printf("FFMPEG::convert_cmodel img_convert() failed\n"); - } -+#else -+ convert_ctx = sws_getContext(width_in, height_in,pix_fmt_in, -+ frame_out->get_w(),frame_out->get_h(),pix_fmt_out, -+ SWS_BICUBIC, NULL, NULL, NULL); -+ -+ if(convert_ctx == NULL){ -+ printf("FFMPEG::convert_cmodel : swscale context initialization failed\n"); -+ return 1; -+ } -+ -+ result = sws_scale(convert_ctx, -+ picture_in->data, picture_in->linesize, -+ 0, 0, -+ picture_out.data, picture_out.linesize); -+ -+ -+ sws_freeContext(convert_ctx); -+ -+ if(result){ -+ printf("FFMPEG::convert_cmodel sws_scale() failed\n"); -+ } -+#endif - return result; - } - -Index: cinelerra-cvs/cinelerra/ffmpeg.h -=================================================================== ---- cinelerra-cvs.orig/cinelerra/ffmpeg.h -+++ cinelerra-cvs/cinelerra/ffmpeg.h -@@ -3,6 +3,9 @@ - - extern "C" { - #include <avcodec.h> -+#ifdef HAVE_SWSCALER -+#include <swscale.h> -+#endif - }; - - #include "asset.h" -Index: cinelerra-cvs/configure.in -=================================================================== ---- cinelerra-cvs.orig/configure.in -+++ cinelerra-cvs/configure.in -@@ -341,10 +341,33 @@ AC_SUBST(CPU_CFLAGS) - ############ external ffmpeg - AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library])) - -+AH_TEMPLATE(HAVE_SWSCALER, [Define to 1 if swscaler is available in ffmpeg.]) -+ - if test "x$with_external_ffmpeg" = "xyes"; then -- PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc]) -+ PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc]) - FFMPEG_FOLDER="" - FFMPEG_EXTERNALTEXT="External ffmpeg" -+ -+ dnl -------------------------------------------------------------- -+ dnl check if libavcodec contains img_convert -+ dnl that means that libswscale is compiled in -+ -+ AC_MSG_CHECKING(for ffmpeg swscale support) -+ saved_LIBS="$LIBS" -+ LIBS="$saved_LIBS $FFMPEG_TEMP_LIBS" -+ AC_TRY_LINK([#include <ffmpeg/avcodec.h>], -+ [img_convert(0, 0, 0,0,0,0)], -+ enable_ffmpeg_swscale=no,enable_ffmpeg_swscale=yes) -+ LIBS="$saved_LIBS" -+ AC_MSG_RESULT($enable_ffmpeg_swscale) -+ -+ if test x"$enable_ffmpeg_swscale" == xyes; then -+ AC_DEFINE(HAVE_SWSCALER) -+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale]) -+ else -+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc]) -+ fi -+ - else - FFMPEG_FOLDER=ffmpeg - FFMPEG_CFLAGS="-I\$(top_srcdir)/quicktime/ffmpeg/libavcodec" |