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
diff --git a/libavdevice/audio.c b/libavdevice/oss_audio.c
similarity index 100%
rename from libavdevice/audio.c
rename to libavdevice/oss_audio.c