summaryrefslogtreecommitdiffstats
path: root/liba52
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-27 11:46:56 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-27 11:46:56 +0000
commit835f0aaae6d957300611289c23b95abd6dd05e25 (patch)
tree27917f3fc9eaf0c16d4e6864b9a5e2bdc6d08c31 /liba52
parentf9857014b5a8ad705c52831789bceb845c7e7822 (diff)
downloadmpv-835f0aaae6d957300611289c23b95abd6dd05e25.tar.bz2
mpv-835f0aaae6d957300611289c23b95abd6dd05e25.tar.xz
Merge liba52/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'liba52')
-rw-r--r--liba52/Makefile15
1 files changed, 0 insertions, 15 deletions
diff --git a/liba52/Makefile b/liba52/Makefile
deleted file mode 100644
index 4ecba8ae59..0000000000
--- a/liba52/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-include ../config.mak
-
-LIBNAME_COMMON = liba52.a
-
-SRCS_COMMON = crc.c \
- resample.c \
- bit_allocate.c \
- bitstream.c \
- downmix.c \
- imdct.c \
- parse.c \
-
-include ../mpcommon.mak
-
-test: test.c ../cpudetect.o $(LIBNAME_COMMON)