[vlc-commits] commit: Revert "contribs: fix libmp3lame detection in ffmpeg" ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Thu Oct  7 10:43:00 2010 -0700| [fb6bead8e2ab4f9e52dfeb718fba82e4c73f7c36] | committer: Rafaël Carré 

Revert "contribs: fix libmp3lame detection in ffmpeg"

This reverts commit 5ff88fe4590d27a27173847e212f1173dce74ef1.
Patch applied upstream

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fb6bead8e2ab4f9e52dfeb718fba82e4c73f7c36
---

 extras/contrib/src/Makefile                  |    1 -
 extras/contrib/src/Patches/ffmpeg-lame.patch |   31 --------------------------
 2 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 01c5ce2..b707891 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1046,7 +1046,6 @@ else
 ffmpeg:
 endif
 	$(SVN) co $(FFMPEG_SVN) ffmpeg
-	(cd $@; patch -p1 < ../Patches/ffmpeg-lame.patch)
 ifdef HAVE_ISA_THUMB
 	patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
 endif
diff --git a/extras/contrib/src/Patches/ffmpeg-lame.patch b/extras/contrib/src/Patches/ffmpeg-lame.patch
deleted file mode 100644
index eca583c..0000000
--- a/extras/contrib/src/Patches/ffmpeg-lame.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d003d83c02ba183cdd90c238bd96e1a4103ad012 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre at gmail.com>
-Date: Wed, 6 Oct 2010 13:13:32 +0200
-Subject: [PATCH] libmp3lame: don't check unused function in detection
-
-hip_decode_init() isn't used by the wrapper, and can be absent from the
-library if lame was configured with --disable-decoder (like it is done
-for windows builds of VLC)
-
-Unfortunately this also removes the way to detect a libmp3lame more recent
-than the buggy 3.98.2
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 607a180..89ba4a5 100755
---- a/configure
-+++ b/configure
-@@ -2744,7 +2744,7 @@ enabled libdirac   && add_cflags $(pkg-config --cflags dirac) &&
-                       require  libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac)
- enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
- enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
--enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h hip_decode_init -lmp3lame
-+enabled libmp3lame && require  "libmp3lame >= 3.98" lame/lame.h lame_set_VBR_quality -lmp3lame
- enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
- enabled libopencore_amrnb  && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
- enabled libopencore_amrwb  && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
--- 
-1.7.3.1
-