Mercurial > mplayer.hg

annotate libmpeg2/Makefile @ 26146:20a126aaa756

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ve_vfw.c: #include aviheader.h instead of wine avifmt.h Compilation was broken after libmpdemux/muxer.h started including libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and loader/wine/avifmt.h, and the latter has definitions that conflict with aviheader.h ones. Fix by removing the avifmt.h include. I did not carefully check that changing the includes doesn't break any ve_vfw.c code. However it at least fixes compilation, and if the avifmt.h versions differ in some significant way then the code is fundamentally broken anyway: ve_vfw cannot use different versions of the avi struct definitions when it also uses shared muxer.h types (those must use the standard definitions to keep the type compatible with what's used in other files).
author uau
date Thu, 06 Mar 2008 01:57:26 +0000
parents ee7cc1c29cbc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 include ../config.mak
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
22528
8bcff5c7e387 Give more descriptive names to the source and library variables and split
diego
parents: 22527
diff changeset
3 LIBNAME_COMMON = libmpeg2.a
8bcff5c7e387 Give more descriptive names to the source and library variables and split
diego
parents: 22527
diff changeset
4
8bcff5c7e387 Give more descriptive names to the source and library variables and split
diego
parents: 22527
diff changeset
5 SRCS_COMMON = alloc.c \
22531
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
6 cpu_accel.c\
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
7 cpu_state.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
8 decode.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
9 header.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
10 idct.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
11 motion_comp.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
12 slice.c \
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 5515
diff changeset
13
23664
f19f12214991 Get rid of duplicate processor feature variables.
diego
parents: 23543
diff changeset
14 SRCS_COMMON-$(HAVE_MMX) += idct_mmx.c motion_comp_mmx.c
f19f12214991 Get rid of duplicate processor feature variables.
diego
parents: 23543
diff changeset
15 SRCS_COMMON-$(HAVE_ALTIVEC) += motion_comp_altivec.c idct_altivec.c
f19f12214991 Get rid of duplicate processor feature variables.
diego
parents: 23543
diff changeset
16 SRCS_COMMON-$(HAVE_VIS) += motion_comp_vis.c
24719
ee7cc1c29cbc cosmetics: Align some lines.
diego
parents: 23664
diff changeset
17 SRCS_COMMON-$(ARCH_ALPHA) += idct_alpha.c motion_comp_alpha.c
ee7cc1c29cbc cosmetics: Align some lines.
diego
parents: 23664
diff changeset
18 SRCS_COMMON-$(ARCH_ARMV4L) += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S
21309
ef59ac68c9b6 FFmpeg-style dependency declaration
diego
parents: 21259
diff changeset
19
21259
92b122592776 Merge common parts of all Makefiles into one file included by all.
diego
parents: 21206
diff changeset
20 include ../mpcommon.mak