diff options
| author | Benoit Fouet <benoit.fouet@free.fr> | 2009-01-21 08:43:38 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2009-01-21 08:43:38 +0000 |
| commit | 33054e35e30ab69b600964b5f2ceefd7e4624033 (patch) | |
| tree | abe97af1aeed97644d245b7a22549932237bef87 | |
| parent | a848cfe97c8d8424dfa9138fb32fee052ebde762 (diff) | |
| download | ffmpeg-33054e35e30ab69b600964b5f2ceefd7e4624033.tar.gz | |
Rename audio.c to oss_audio.c in libavdevice.
Originally committed as revision 16707 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavdevice/Makefile | 4 | ||||
| -rw-r--r-- | libavdevice/oss_audio.c (renamed from libavdevice/audio.c) | 0 |
2 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 diff --git a/libavdevice/audio.c b/libavdevice/oss_audio.c index 8f3e678db0..8f3e678db0 100644 --- a/libavdevice/audio.c +++ b/libavdevice/oss_audio.c |