Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
8a72b02a
Commit
8a72b02a
authored
Jan 28, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: disable FFmpeg/libav programs only when cross-compiling
It can be useful to test avplay/ffplay localy
parent
84ecfba8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+1
-2
No files found.
contrib/src/ffmpeg/rules.mak
View file @
8a72b02a
...
@@ -26,7 +26,6 @@ FFMPEGCONF = \
...
@@ -26,7 +26,6 @@ FFMPEGCONF = \
--disable-filters
\
--disable-filters
\
--disable-bsfs
\
--disable-bsfs
\
--disable-bzlib
\
--disable-bzlib
\
--disable-programs
\
--disable-avresample
--disable-avresample
ifdef
USE_FFMPEG
ifdef
USE_FFMPEG
...
@@ -59,7 +58,7 @@ endif
...
@@ -59,7 +58,7 @@ endif
endif
endif
ifdef
HAVE_CROSS_COMPILE
ifdef
HAVE_CROSS_COMPILE
FFMPEGCONF
+=
--enable-cross-compile
FFMPEGCONF
+=
--enable-cross-compile
--disable-programs
ifndef
HAVE_DARWIN_OS
ifndef
HAVE_DARWIN_OS
FFMPEGCONF
+=
--cross-prefix
=
$(HOST)
-
FFMPEGCONF
+=
--cross-prefix
=
$(HOST)
-
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