aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/Makefile
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2009-01-21 08:43:38 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2009-01-21 08:43:38 +0000
commit33054e35e30ab69b600964b5f2ceefd7e4624033 (patch)
treeabe97af1aeed97644d245b7a22549932237bef87 /libavdevice/Makefile
parenta848cfe97c8d8424dfa9138fb32fee052ebde762 (diff)
downloadffmpeg-33054e35e30ab69b600964b5f2ceefd7e4624033.tar.gz
Rename audio.c to oss_audio.c in libavdevice.
Originally committed as revision 16707 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavdevice/Makefile')
-rw-r--r--libavdevice/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 655c033b2c..31337766ea 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -10,8 +10,8 @@ OBJS = alldevices.o
# input/output devices
OBJS-$(CONFIG_BKTR_DEMUXER) += bktr.o
OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.o
-OBJS-$(CONFIG_OSS_DEMUXER) += audio.o
-OBJS-$(CONFIG_OSS_MUXER) += audio.o
+OBJS-$(CONFIG_OSS_DEMUXER) += oss_audio.o
+OBJS-$(CONFIG_OSS_MUXER) += oss_audio.o
OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.o
OBJS-$(CONFIG_V4L_DEMUXER) += v4l.o
OBJS-$(CONFIG_VFWCAP_DEMUXER) += vfwcap.o