summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-23 14:01:13 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-23 14:01:13 +0000
commita6a75d5d5028959607aa94ceee8a6b28d42b9311 (patch)
treeb86e13f4f04ac18a2fe8e1bab24e77d64115d7cb
parent0efaea716f3b149ba3146b7f2a4d099d74c8f748 (diff)
downloadmpv-a6a75d5d5028959607aa94ceee8a6b28d42b9311.tar.bz2
mpv-a6a75d5d5028959607aa94ceee8a6b28d42b9311.tar.xz
ima4 added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2423 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile2
-rw-r--r--codec-cfg.c1
-rw-r--r--codec-cfg.h1
3 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fa7dc02d03..73cedc4dbc 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ PRG_CFG = codec-cfg
#prefix = /usr/local
BINDIR = ${prefix}/bin
# BINDIR = /usr/local/bin
-SRCS = xacodec.c cpudetect.c postproc/swscale.c postproc/postprocess.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c xa/rle8.c lirc_mp.c cfgparser.c mixer.c spudec.c
+SRCS = ima4.c xacodec.c cpudetect.c postproc/swscale.c postproc/postprocess.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c xa/rle8.c lirc_mp.c cfgparser.c mixer.c spudec.c
OBJS = $(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) $(MADLIB_INC) # -Wall
A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) $(MADLIB_LIB)
diff --git a/codec-cfg.c b/codec-cfg.c
index 64a3c94f5c..fcce9a2481 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -210,6 +210,7 @@ static short get_driver(char *s,int audioflag)
"libvorbis",
"ffmpeg",
"libmad",
+ "ima4",
NULL
};
static char *videodrv[] = {
diff --git a/codec-cfg.h b/codec-cfg.h
index 9b1f7858bc..01e77953b6 100644
--- a/codec-cfg.h
+++ b/codec-cfg.h
@@ -30,6 +30,7 @@
#define AFM_VORBIS 10
#define AFM_FFMPEG 11
#define AFM_MAD 12
+#define AFM_IMA4 13
#define VFM_MPEG 1
#define VFM_VFW 2