From: Jean-Baptiste Kempf <jb@altair.videolan.org>
Date: Tue, 10 Jun 2008 22:51:12 +0000 (+0200)
Subject: FFmpeg update.
X-Git-Tag: 0.9.0-test0~228
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ab9b30429626c36ea819e05dc5fce1bc13db59c1;p=vlc

FFmpeg update.
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index e166f6214b..20c47c2388 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1067,8 +1067,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 12920
-	(cd $@; patch -p0 < ../Patches/ffmpeg-pkg-config.patch)
+	$(SVN) co $(FFMPEG_SVN) ffmpeg 
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1090,7 +1089,6 @@ ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
 	patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
-	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-configure.patch )
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	echo "ffmpeg snapshot is too old, you MUST use subversion !"
diff --git a/extras/contrib/src/Patches/ffmpeg-pkg-config.patch b/extras/contrib/src/Patches/ffmpeg-pkg-config.patch
deleted file mode 100644
index 0cb2b10a70..0000000000
--- a/extras/contrib/src/Patches/ffmpeg-pkg-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: configure
-===================================================================
---- configure	(révision 13435)
-+++ configure	(copie de travail)
-@@ -2169,11 +2169,13 @@
- version=$3
- libs=$4
- requires=$5
-+libdir_pc=`echo $libdir|sed s'|$(PREFIX)|${prefix}|'`
-+incdir_pc=`echo $incdir|sed 's|$(PREFIX)|${prefix}|'`
- cat <<EOF >$name.pc
- prefix=$prefix
- exec_prefix=\${prefix}
--libdir=$libdir
--includedir=$incdir
-+libdir=$libdir_pc
-+includedir=$incdir_pc
- 
- Name: $name
- Description: $comment
diff --git a/extras/contrib/src/Patches/ffmpeg-svn-configure.patch b/extras/contrib/src/Patches/ffmpeg-svn-configure.patch
deleted file mode 100644
index 9e95d016dc..0000000000
--- a/extras/contrib/src/Patches/ffmpeg-svn-configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 12501)
-+++ configure	(working copy)
-@@ -2201,8 +2201,8 @@
- fi
- 
- if enabled swscale; then
--    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" -lswscale "libavutil = $LIBAVUTIL_VERSION"
--    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
-+    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "-lswscale -lm"  "libavutil = $LIBAVUTIL_VERSION"
-+    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "-lm" "libavutil = $LIBAVUTIL_VERSION"
- else
-     pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
-     pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"