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
96ea9d8f
Commit
96ea9d8f
authored
Nov 01, 2010
by
Rafaël Carré
Committed by
Jean-Baptiste Kempf
Nov 01, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: do not build libvpx decoder
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
b6c9bd51
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
extras/contrib/src/contrib-src.mak
extras/contrib/src/contrib-src.mak
+3
-2
No files found.
extras/contrib/src/contrib-src.mak
View file @
96ea9d8f
...
@@ -90,7 +90,7 @@ else
...
@@ -90,7 +90,7 @@ else
HOSTCC2
=
$(HOSTCC)
HOSTCC2
=
$(HOSTCC)
endif
endif
FFMPEGCONF
=
--disable-doc
FFMPEGCONF
=
--disable-doc
--disable-decoder
=
libvpx
# cross compiling
# cross compiling
#This should be inside the if block but some config scripts are buggy
#This should be inside the if block but some config scripts are buggy
...
@@ -155,6 +155,7 @@ endif
...
@@ -155,6 +155,7 @@ endif
ifdef
HAVE_DARWIN_OS
ifdef
HAVE_DARWIN_OS
X264CONF
=
--host
=
$(HOST)
X264CONF
=
--host
=
$(HOST)
X264CONF
+=
--enable-pic
X264CONF
+=
--enable-pic
FFMPEGCONF
+=
--enable-libvpx
ifdef
HAVE_DARWIN_32
ifdef
HAVE_DARWIN_32
FFMPEGCONF
+=
--cc
=
gcc-4.0
FFMPEGCONF
+=
--cc
=
gcc-4.0
else
else
...
@@ -1035,7 +1036,7 @@ FFMPEGCONF += \
...
@@ -1035,7 +1036,7 @@ FFMPEGCONF += \
--disable-avfilter
\
--disable-avfilter
\
--disable-network
--disable-network
ifdef
HAVE_WIN64
ifdef
HAVE_WIN64
FFMPEGCONF
+=
--disable-bzlib
--disable-decoder
=
dca
--disable-encoder
=
vorbis
--enable-libmp3lame
--enable-w32threads
--disable-dxva2
--disable-bsfs
FFMPEGCONF
+=
--disable-bzlib
--disable-decoder
=
dca
--disable-encoder
=
vorbis
--enable-libmp3lame
--enable-w32threads
--disable-dxva2
--disable-bsfs
else
else
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
FFMPEGCONF
+=
--disable-bzlib
--disable-decoder
=
dca
--disable-encoder
=
vorbis
--enable-libmp3lame
--enable-w32threads
--enable-dxva2
--disable-bsfs
--enable-libvpx
FFMPEGCONF
+=
--disable-bzlib
--disable-decoder
=
dca
--disable-encoder
=
vorbis
--enable-libmp3lame
--enable-w32threads
--enable-dxva2
--disable-bsfs
--enable-libvpx
...
...
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