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
21f9e5fb
Commit
21f9e5fb
authored
Jul 22, 2012
by
Edward Wang
Committed by
Rafaël Carré
Jul 25, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: ffmpeg: Add --arch=x86 if compiling to x86
Signed-off-by:
Rafaël Carré
<
funman@videolan.org
>
parent
27a3a080
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+5
-0
contrib/src/postproc/rules.mak
contrib/src/postproc/rules.mak
+5
-0
No files found.
contrib/src/ffmpeg/rules.mak
View file @
21f9e5fb
...
@@ -61,6 +61,11 @@ FFMPEG_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
...
@@ -61,6 +61,11 @@ FFMPEG_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
endif
endif
endif
endif
# x86 stuff
ifeq
($(ARCH),i386)
FFMPEGCONF
+=
--arch
=
x86
endif
# Darwin
# Darwin
ifdef
HAVE_DARWIN_OS
ifdef
HAVE_DARWIN_OS
FFMPEGCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
FFMPEGCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
...
...
contrib/src/postproc/rules.mak
View file @
21f9e5fb
...
@@ -30,6 +30,11 @@ POSTPROC_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
...
@@ -30,6 +30,11 @@ POSTPROC_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
endif
endif
endif
endif
# x86 stuff
ifeq
($(ARCH),i386)
POSTPROCCONF
+=
--arch
=
x86
endif
# Darwin
# Darwin
ifdef
HAVE_DARWIN_OS
ifdef
HAVE_DARWIN_OS
POSTPROCCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
POSTPROCCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
...
...
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