summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/Makefile.am
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-08 13:18:42 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-08 13:18:42 +0000
commit6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea (patch)
treee70be493d1222b10f96aa5efac01c0ec0d5bcc97 /src/libffmpeg/libavcodec/Makefile.am
parent1fb58a63872660424777d41389e426dc90f1b660 (diff)
downloadxine-lib-6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea.tar.gz
xine-lib-6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea.tar.bz2
syncing ffmpeg (with some compilation fixes)
- fixes wma bugs - mace, huffyuv and mp3 decoders imported (but not enabled) tested: wma (v1 and v2), mpeg4, msmpeg4 v1, v2 and v3, divx3, divx4, divx5, xvid and dv decoders. everything looks fine. CVS patchset: 3828 CVS date: 2003/01/08 13:18:42
Diffstat (limited to 'src/libffmpeg/libavcodec/Makefile.am')
-rw-r--r--src/libffmpeg/libavcodec/Makefile.am9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index a92987fe6..1298e8790 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -4,7 +4,7 @@
SUBDIRS = armv4l i386 mlib alpha
-EXTRA_DIST = fdctref.c imgresample.c
+EXTRA_DIST = fdctref.c imgresample.c motion_est_template.c
AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
ASFLAGS =
@@ -22,15 +22,18 @@ libavcodec_la_SOURCES = \
fft.c \
h263.c \
h263dec.c \
+ huffyuv.c \
imgconvert.c \
jfdctfst.c \
jfdctint.c \
jrevdct.c \
mdct.c \
+ mace.c \
mem.c \
mjpeg.c \
motion_est.c \
mpeg12.c \
+ mpegaudiodec.c \
mpegvideo.c \
msmpeg4.c \
ratecontrol.c \
@@ -39,6 +42,7 @@ libavcodec_la_SOURCES = \
svq1.c \
utils.c \
wmadec.c
+# wmv2.c
#imgresample.c
libavcodec_la_LDFLAGS = \
@@ -57,6 +61,9 @@ noinst_HEADERS = \
mangle.h \
mpeg4data.h \
mpeg12data.h \
+ mpegaudio.h \
+ mpegaudiodectab.h \
+ mpegaudiotab.h \
mpegvideo.h \
msmpeg4data.h \
simple_idct.h \