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
c33aef8b
Commit
c33aef8b
authored
Jul 04, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: build gsm only if ffmpeg is built
parent
15228fd3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+4
-5
contrib/src/gsm/rules.mak
contrib/src/gsm/rules.mak
+0
-2
No files found.
contrib/src/ffmpeg/rules.mak
View file @
c33aef8b
...
...
@@ -5,9 +5,11 @@ FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
FFMPEG_SVN
=
svn://svn.ffmpeg.org/ffmpeg/trunk
FFMPEG_SVN_REV
=
26400
FFMPEGCONF
=
--cc
=
"
$(CC)
"
\
FFMPEGCONF
=
\
--cc
=
"
$(CC)
"
\
--disable-doc
\
--disable-decoder
=
libvpx
\
--enable-gsm
\
--disable-debug
\
--enable-gpl
\
--enable-postproc
\
...
...
@@ -19,7 +21,7 @@ FFMPEGCONF = --cc="$(CC)" \
--disable-protocols
\
--disable-avfilter
\
--disable-network
DEPS_ffmpeg
=
zlib
DEPS_ffmpeg
=
zlib
gsm
# Optional dependencies
ifdef
BUILD_ENCODERS
...
...
@@ -31,9 +33,6 @@ FFMPEGCONF += --disable-encoders --disable-muxers
# XXX: REVISIT --enable-small ?
endif
#FFMPEGCONF += --enable-libgsm
#DEPS_ffmpeg += gsm $(DEPS_gsm)
#FFMPEGCONF += --enable-libvpx
#DEPS_ffmpeg += vpx $(DEPS_vpx)
...
...
contrib/src/gsm/rules.mak
View file @
c33aef8b
...
...
@@ -2,8 +2,6 @@
GSM_VERSION
:=
1.0.12
GSM_URL
:=
$(CONTRIB_VIDEOLAN)
/gsm-
$(GSM_VERSION)
.tar.gz
PKGS
+=
gsm
$(TARBALLS)/gsm-$(GSM_VERSION).tar.gz
:
$(
call
download,
$(GSM_URL)
)
...
...
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