Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
277f1520
Commit
277f1520
authored
Feb 03, 2015
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib/ffmpeg: disable lzma for Darwin
(cherry picked from commit 6c7b1c97f6d940fef736cf4848b2ca67f4d97190)
parent
8dff2bfd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+3
-0
No files found.
contrib/src/ffmpeg/rules.mak
View file @
277f1520
...
@@ -97,6 +97,9 @@ endif
...
@@ -97,6 +97,9 @@ endif
# Darwin
# Darwin
ifdef
HAVE_DARWIN_OS
ifdef
HAVE_DARWIN_OS
FFMPEGCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
FFMPEGCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
ifdef
USE_FFMPEG
FFMPEGCONF
+=
--disable-lzma
endif
ifeq
($(ARCH),x86_64)
ifeq
($(ARCH),x86_64)
FFMPEGCONF
+=
--cpu
=
core2
FFMPEGCONF
+=
--cpu
=
core2
endif
endif
...
...
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