Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
  avdevice: Apply a more consistent file naming scheme

Conflicts:
	libavdevice/Makefile
	libavdevice/alsa.h
	libavdevice/alsa_dec.c
	libavdevice/alsa_enc.c
	libavdevice/sndio_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

14 files changed, 28 insertions, 30 deletions

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 696cc88..f57ec0b 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -10,10 +10,8 @@ OBJS    = alldevices.o                                                  \
           utils.o                                                       \
 
 # input/output devices
-OBJS-$(CONFIG_ALSA_INDEV)                += alsa-audio-common.o \
-                                            alsa-audio-dec.o timefilter.o
-OBJS-$(CONFIG_ALSA_OUTDEV)               += alsa-audio-common.o \
-                                            alsa-audio-enc.o
+OBJS-$(CONFIG_ALSA_INDEV)                += alsa_dec.o alsa.o timefilter.o
+OBJS-$(CONFIG_ALSA_OUTDEV)               += alsa_enc.o alsa.o
 OBJS-$(CONFIG_AVFOUNDATION_INDEV)        += avfoundation.o
 OBJS-$(CONFIG_BKTR_INDEV)                += bktr.o
 OBJS-$(CONFIG_CACA_OUTDEV)               += caca.o
@@ -29,20 +27,20 @@ OBJS-$(CONFIG_FBDEV_OUTDEV)              += fbdev_enc.o \
                                             fbdev_common.o
 OBJS-$(CONFIG_GDIGRAB_INDEV)             += gdigrab.o
 OBJS-$(CONFIG_IEC61883_INDEV)            += iec61883.o
-OBJS-$(CONFIG_JACK_INDEV)                += jack_audio.o timefilter.o
+OBJS-$(CONFIG_JACK_INDEV)                += jack.o timefilter.o
 OBJS-$(CONFIG_LAVFI_INDEV)               += lavfi.o
 OBJS-$(CONFIG_OPENAL_INDEV)              += openal-dec.o
 OBJS-$(CONFIG_OPENGL_OUTDEV)             += opengl_enc.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_audio_dec.o \
                                             pulse_audio_common.o timefilter.o
 OBJS-$(CONFIG_PULSE_OUTDEV)              += pulse_audio_enc.o \
                                             pulse_audio_common.o
 OBJS-$(CONFIG_QTKIT_INDEV)               += qtkit.o
 OBJS-$(CONFIG_SDL_OUTDEV)                += sdl.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 v4l2-common.o timefilter.o
 OBJS-$(CONFIG_V4L2_OUTDEV)               += v4l2enc.o v4l2-common.o
 OBJS-$(CONFIG_V4L_INDEV)                 += v4l.o
@@ -68,7 +66,7 @@ SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV)       += fbdev_common.h
 SKIPHEADERS-$(CONFIG_LIBPULSE)           += pulse_audio_common.h
 SKIPHEADERS-$(CONFIG_V4L2_INDEV)         += v4l2-common.h
 SKIPHEADERS-$(CONFIG_V4L2_OUTDEV)        += v4l2-common.h
-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
index bf876ed..27a1655 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
index cf0e942..f8b7449 100644
--- a/libavdevice/alsa-audio.h
+++ b/libavdevice/alsa.h
@@ -27,8 +27,8 @@
  * @author Benoit Fouet ( benoit fouet free fr )
  */
 
-#ifndef AVDEVICE_ALSA_AUDIO_H
-#define AVDEVICE_ALSA_AUDIO_H
+#ifndef AVDEVICE_ALSA_H
+#define AVDEVICE_ALSA_H
 
 #include <alsa/asoundlib.h>
 #include "config.h"
@@ -101,4 +101,4 @@ int ff_alsa_extend_reorder_buf(AlsaData *s, int size);
 
 int ff_alsa_get_device_list(AVDeviceInfoList *device_list, snd_pcm_stream_t stream_type);
 
-#endif /* AVDEVICE_ALSA_AUDIO_H */
+#endif /* AVDEVICE_ALSA_H */
diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa_dec.c
index 3e8e70b..286af65 100644
--- a/libavdevice/alsa-audio-dec.c
+++ b/libavdevice/alsa_dec.c
@@ -55,7 +55,7 @@
 #include "libavformat/internal.h"
 
 #include "avdevice.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
index acf8af3..fb428f0 100644
--- a/libavdevice/alsa-audio-enc.c
+++ b/libavdevice/alsa_enc.c
@@ -45,7 +45,7 @@
 
 #include "libavformat/internal.h"
 #include "avdevice.h"
-#include "alsa-audio.h"
+#include "alsa.h"
 
 static av_cold int audio_write_header(AVFormatContext *s1)
 {
diff --git a/libavdevice/jack_audio.c b/libavdevice/jack.c
index 053dba7..053dba7 100644
--- a/libavdevice/jack_audio.c
+++ b/libavdevice/jack.c
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss.c
index 1f8b5e7..d741128 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss.c
@@ -40,7 +40,7 @@
 #include "libavcodec/avcodec.h"
 #include "avdevice.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
index 8258028..1f3f5e4 100644
--- a/libavdevice/oss_audio.h
+++ b/libavdevice/oss.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVDEVICE_OSS_AUDIO_H
-#define AVDEVICE_OSS_AUDIO_H
+#ifndef AVDEVICE_OSS_H
+#define AVDEVICE_OSS_H
 
 #include "libavcodec/avcodec.h"
 
@@ -42,4 +42,4 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
 
 int ff_oss_audio_close(OSSAudioData *s);
 
-#endif /* AVDEVICE_OSS_AUDIO_H */
+#endif /* AVDEVICE_OSS_H */
diff --git a/libavdevice/oss_audio_dec.c b/libavdevice/oss_dec.c
index 1f86d06..156d6ae 100644
--- a/libavdevice/oss_audio_dec.c
+++ b/libavdevice/oss_dec.c
@@ -44,7 +44,7 @@
 #include "avdevice.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
index 5d3bded..3781eb5 100644
--- a/libavdevice/oss_audio_enc.c
+++ b/libavdevice/oss_enc.c
@@ -40,7 +40,7 @@
 #include "avdevice.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
index 19f39be..46f2875 100644
--- a/libavdevice/sndio_common.c
+++ b/libavdevice/sndio.c
@@ -24,7 +24,7 @@
 
 #include "avdevice.h"
 
-#include "sndio_common.h"
+#include "libavdevice/sndio.h"
 
 static inline void movecb(void *addr, int delta)
 {
diff --git a/libavdevice/sndio_common.h b/libavdevice/sndio.h
index 74f41f5..54a5ec3 100644
--- a/libavdevice/sndio_common.h
+++ b/libavdevice/sndio.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVDEVICE_SNDIO_COMMON_H
-#define AVDEVICE_SNDIO_COMMON_H
+#ifndef AVDEVICE_SNDIO_H
+#define AVDEVICE_SNDIO_H
 
 #include <stdint.h>
 #include <sndio.h>
@@ -45,4 +45,4 @@ typedef struct SndioData {
 int ff_sndio_open(AVFormatContext *s1, int is_output, const char *audio_device);
 int ff_sndio_close(SndioData *s);
 
-#endif /* AVDEVICE_SNDIO_COMMON_H */
+#endif /* AVDEVICE_SNDIO_H */
diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c
index 9cc9952..f815b37 100644
--- a/libavdevice/sndio_dec.c
+++ b/libavdevice/sndio_dec.c
@@ -29,7 +29,7 @@
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 
-#include "sndio_common.h"
+#include "libavdevice/sndio.h"
 
 static av_cold int audio_read_header(AVFormatContext *s1)
 {
diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c
index 2a24620..52b9060 100644
--- a/libavdevice/sndio_enc.c
+++ b/libavdevice/sndio_enc.c
@@ -25,8 +25,8 @@
 #include "libavutil/internal.h"
 
 
-#include "avdevice.h"
-#include "sndio_common.h"
+#include "libavdevice/avdevice.h"
+#include "libavdevice/sndio.h"
 
 static av_cold int audio_write_header(AVFormatContext *s1)
 {