---
Squashed it all together and dropped further silly name suffixes.
libavdevice/Makefile | 18 ++++++++----------
libavdevice/{alsa-audio-common.c => alsa.c} | 2 +-
libavdevice/{alsa-audio.h => alsa.h} | 0
libavdevice/{alsa-audio-dec.c => alsa_dec.c} | 2 +-
libavdevice/{alsa-audio-enc.c => alsa_enc.c} | 2 +-
libavdevice/{oss_audio.c => oss.c} | 2 +-
libavdevice/{oss_audio.h => oss.h} | 0
libavdevice/{oss_audio_dec.c => oss_dec.c} | 2 +-
libavdevice/{oss_audio_enc.c => oss_enc.c} | 2 +-
libavdevice/{sndio_common.c => sndio.c} | 2 +-
libavdevice/{sndio_common.h => sndio.h} | 0
libavdevice/sndio_dec.c | 2 +-
libavdevice/sndio_enc.c | 2 +-
13 files changed, 17 insertions(+), 19 deletions(-)
rename libavdevice/{alsa-audio-common.c => alsa.c} (99%)
rename libavdevice/{alsa-audio.h => alsa.h} (100%)
rename libavdevice/{alsa-audio-dec.c => alsa_dec.c} (99%)
rename libavdevice/{alsa-audio-enc.c => alsa_enc.c} (99%)
rename libavdevice/{oss_audio.c => oss.c} (99%)
rename libavdevice/{oss_audio.h => oss.h} (100%)
rename libavdevice/{oss_audio_dec.c => oss_dec.c} (99%)
rename libavdevice/{oss_audio_enc.c => oss_enc.c} (99%)
rename libavdevice/{sndio_common.c => sndio.c} (99%)
rename libavdevice/{sndio_common.h => sndio.h} (100%)
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 2a21832..7d12ae9 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -7,19 +7,17 @@ OBJS = alldevices.o
\
avdevice.o \
# input/output devices
-OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \
- alsa-audio-dec.o
-OBJS-$(CONFIG_ALSA_OUTDEV) += alsa-audio-common.o \
- alsa-audio-enc.o
+OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o
+OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o
OBJS-$(CONFIG_BKTR_INDEV) += bktr.o
OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o
OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o
OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o timefilter.o
-OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o oss_audio_dec.o
-OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o oss_audio_enc.o
+OBJS-$(CONFIG_OSS_INDEV) += oss_dec.o oss.o
+OBJS-$(CONFIG_OSS_OUTDEV) += oss_enc.o oss.o
OBJS-$(CONFIG_PULSE_INDEV) += pulse.o
-OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o
-OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o
+OBJS-$(CONFIG_SNDIO_INDEV) += sndio_dec.o sndio.o
+OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_enc.o sndio.o
OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o
OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o
OBJS-$(CONFIG_X11GRAB_INDEV) += x11grab.o
@@ -31,7 +29,7 @@ OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
-SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
-SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h
+SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa.h
+SKIPHEADERS-$(HAVE_SNDIO_H) += sndio.h
TESTPROGS = timefilter
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa.c
similarity index 99%
rename from libavdevice/alsa-audio-common.c
rename to libavdevice/alsa.c
index 21f1594..6d68267 100644
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa.c
@@ -33,7 +33,7 @@
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
-#include "alsa-audio.h"
+#include "alsa.h"
static av_cold snd_pcm_format_t codec_id_to_pcm_format(int codec_id)
{
diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa.h
similarity index 100%
rename from libavdevice/alsa-audio.h
rename to libavdevice/alsa.h
diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa_dec.c
similarity index 99%
rename from libavdevice/alsa-audio-dec.c
rename to libavdevice/alsa_dec.c
index 0687a4a..6951c3a 100644
--- a/libavdevice/alsa-audio-dec.c
+++ b/libavdevice/alsa_dec.c
@@ -50,7 +50,7 @@
#include "libavformat/internal.h"
#include "libavutil/opt.h"
-#include "alsa-audio.h"
+#include "alsa.h"
static av_cold int audio_read_header(AVFormatContext *s1)
{
diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa_enc.c
similarity index 99%
rename from libavdevice/alsa-audio-enc.c
rename to libavdevice/alsa_enc.c
index bb4575f..5aee6f5 100644
--- a/libavdevice/alsa-audio-enc.c
+++ b/libavdevice/alsa_enc.c
@@ -40,7 +40,7 @@
#include <alsa/asoundlib.h>
#include "libavformat/avformat.h"
-#include "alsa-audio.h"
+#include "alsa.h"
static av_cold int audio_write_header(AVFormatContext *s1)
{
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss.c
similarity index 99%
rename from libavdevice/oss_audio.c
rename to libavdevice/oss.c
index 4feb937..eb8d454 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss.c
@@ -39,7 +39,7 @@
#include "libavformat/avformat.h"
-#include "oss_audio.h"
+#include "oss.h"
int ff_oss_audio_open(AVFormatContext *s1, int is_output,
const char *audio_device)
diff --git a/libavdevice/oss_audio.h b/libavdevice/oss.h
similarity index 100%
rename from libavdevice/oss_audio.h
rename to libavdevice/oss.h
diff --git a/libavdevice/oss_audio_dec.c b/libavdevice/oss_dec.c
similarity index 99%
rename from libavdevice/oss_audio_dec.c
rename to libavdevice/oss_dec.c
index 601d91c..3f786cc 100644
--- a/libavdevice/oss_audio_dec.c
+++ b/libavdevice/oss_dec.c
@@ -42,7 +42,7 @@
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
-#include "oss_audio.h"
+#include "oss.h"
static int audio_read_header(AVFormatContext *s1)
{
diff --git a/libavdevice/oss_audio_enc.c b/libavdevice/oss_enc.c
similarity index 99%
rename from libavdevice/oss_audio_enc.c
rename to libavdevice/oss_enc.c
index 688982a..2f07558 100644
--- a/libavdevice/oss_audio_enc.c
+++ b/libavdevice/oss_enc.c
@@ -38,7 +38,7 @@
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
-#include "oss_audio.h"
+#include "oss.h"
static int audio_write_header(AVFormatContext *s1)
{
diff --git a/libavdevice/sndio_common.c b/libavdevice/sndio.c
similarity index 99%
rename from libavdevice/sndio_common.c
rename to libavdevice/sndio.c
index 1bea6c5..6592664 100644
--- a/libavdevice/sndio_common.c
+++ b/libavdevice/sndio.c
@@ -24,7 +24,7 @@
#include "libavformat/avformat.h"
-#include "sndio_common.h"
+#include "sndio.h"
static inline void movecb(void *addr, int delta)
{
diff --git a/libavdevice/sndio_common.h b/libavdevice/sndio.h
similarity index 100%
rename from libavdevice/sndio_common.h
rename to libavdevice/sndio.h
diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c
index 58caaa1..9af270f 100644
--- a/libavdevice/sndio_dec.c
+++ b/libavdevice/sndio_dec.c
@@ -27,7 +27,7 @@
#include "libavutil/opt.h"
#include "libavutil/time.h"
-#include "sndio_common.h"
+#include "sndio.h"
static av_cold int audio_read_header(AVFormatContext *s1)
{
diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c
index 6f69b9e..8bb273a 100644
--- a/libavdevice/sndio_enc.c
+++ b/libavdevice/sndio_enc.c
@@ -24,7 +24,7 @@
#include "libavformat/avformat.h"
-#include "sndio_common.h"
+#include "sndio.h"
static av_cold int audio_write_header(AVFormatContext *s1)
{
--
2.1.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
