Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
186599ff
Commit
186599ff
authored
May 29, 2013
by
Diego Biurrun
Committed by
Martin Storsjö
May 29, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: cosmetics: Place unconditional before conditional OBJS lines
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
9b9b2e9f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
22 deletions
+22
-22
Makefile
libavcodec/arm/Makefile
+19
-19
Makefile
libavcodec/x86/Makefile
+3
-3
No files found.
libavcodec/arm/Makefile
View file @
186599ff
ARCH_HEADERS
=
mathops.h
OBJS
+=
arm/dsputil_init_arm.o
\
arm/dsputil_arm.o
\
arm/fft_init_arm.o
\
arm/fft_fixed_init_arm.o
\
arm/fmtconvert_init_arm.o
\
arm/jrevdct_arm.o
\
arm/simple_idct_arm.o
\
OBJS-$(CONFIG_AAC_DECODER)
+=
arm/aacpsdsp_init_arm.o
\
arm/sbrdsp_init_arm.o
OBJS-$(CONFIG_AC3DSP)
+=
arm/ac3dsp_init_arm.o
\
...
...
@@ -25,21 +33,17 @@ OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_arm.o \
arm/rv40dsp_init_arm.o
OBJS-$(CONFIG_VIDEODSP)
+=
arm/videodsp_init_arm.o
\
OBJS
+=
arm/dsputil_init_arm.o
\
arm/dsputil_arm.o
\
arm/fft_init_arm.o
\
arm/fft_fixed_init_arm.o
\
arm/fmtconvert_init_arm.o
\
arm/jrevdct_arm.o
\
arm/simple_idct_arm.o
\
ARMV5TE-OBJS
+=
arm/dsputil_init_armv5te.o
\
arm/simple_idct_armv5te.o
\
ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO)
+=
arm/mpegvideo_armv5te.o
\
arm/mpegvideo_armv5te_s.o
ARMV5TE-OBJS-$(CONFIG_VIDEODSP)
+=
arm/videodsp_init_armv5te.o
\
arm/videodsp_armv5te.o
ARMV5TE-OBJS
+=
arm/dsputil_init_armv5te.o
\
arm/simple_idct_armv5te.o
\
ARMV6-OBJS
+=
arm/dsputil_init_armv6.o
\
arm/dsputil_armv6.o
\
arm/simple_idct_armv6.o
\
ARMV6-OBJS-$(CONFIG_AC3DSP)
+=
arm/ac3dsp_armv6.o
ARMV6-OBJS-$(CONFIG_HPELDSP)
+=
arm/hpeldsp_init_armv6.o
\
...
...
@@ -49,12 +53,14 @@ ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \
arm/vp8dsp_init_armv6.o
\
arm/vp8dsp_armv6.o
ARMV6-OBJS
+=
arm/dsputil_init_armv6.o
\
arm/dsputil_armv6.o
\
arm/simple_idct_armv6.o
\
VFP-OBJS-$(HAVE_ARMV6)
+=
arm/fmtconvert_vfp.o
NEON-OBJS
+=
arm/dsputil_init_neon.o
\
arm/dsputil_neon.o
\
arm/fmtconvert_neon.o
\
arm/int_neon.o
\
arm/simple_idct_neon.o
\
NEON-OBJS-$(CONFIG_AC3DSP)
+=
arm/ac3dsp_neon.o
NEON-OBJS-$(CONFIG_AAC_DECODER)
+=
arm/aacpsdsp_neon.o
\
arm/sbrdsp_neon.o
...
...
@@ -82,9 +88,3 @@ NEON-OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_neon.o
NEON-OBJS-$(CONFIG_VP6_DECODER)
+=
arm/vp56dsp_neon.o
NEON-OBJS-$(CONFIG_VP8_DECODER)
+=
arm/vp8dsp_init_neon.o
\
arm/vp8dsp_neon.o
NEON-OBJS
+=
arm/dsputil_init_neon.o
\
arm/dsputil_neon.o
\
arm/fmtconvert_neon.o
\
arm/int_neon.o
\
arm/simple_idct_neon.o
\
libavcodec/x86/Makefile
View file @
186599ff
...
...
@@ -47,6 +47,9 @@ MMX-OBJS-$(CONFIG_HPELDSP) += x86/fpel_mmx.o \
x86/rnd_mmx.o
MMX-OBJS-$(CONFIG_VC1_DECODER)
+=
x86/vc1dsp_mmx.o
YASM-OBJS
+=
x86/deinterlace.o
\
x86/fmtconvert.o
\
YASM-OBJS-$(CONFIG_AAC_DECODER)
+=
x86/sbrdsp.o
YASM-OBJS-$(CONFIG_AC3DSP)
+=
x86/ac3dsp.o
YASM-OBJS-$(CONFIG_DCT)
+=
x86/dct32.o
...
...
@@ -86,6 +89,3 @@ YASM-OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp.o
YASM-OBJS-$(CONFIG_VP3DSP)
+=
x86/vp3dsp.o
YASM-OBJS-$(CONFIG_VP6_DECODER)
+=
x86/vp56dsp.o
YASM-OBJS-$(CONFIG_VP8_DECODER)
+=
x86/vp8dsp.o
YASM-OBJS
+=
x86/deinterlace.o
\
x86/fmtconvert.o
\
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