Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
fb6bead8
Commit
fb6bead8
authored
Oct 07, 2010
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "contribs: fix libmp3lame detection in ffmpeg"
This reverts commit
5ff88fe4
. Patch applied upstream
parent
5ff88fe4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
32 deletions
+0
-32
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+0
-1
extras/contrib/src/Patches/ffmpeg-lame.patch
extras/contrib/src/Patches/ffmpeg-lame.patch
+0
-31
No files found.
extras/contrib/src/Makefile
View file @
fb6bead8
...
...
@@ -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
...
...
extras/contrib/src/Patches/ffmpeg-lame.patch
deleted
100644 → 0
View file @
5ff88fe4
From d003d83c02ba183cdd90c238bd96e1a4103ad012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre@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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment