RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avdevice: Apply a more consistent file naming scheme

This commit is contained in:
Diego Biurrun 2015-03-27 12:40:23 +01:00
parent c201069fac
commit 8d26c193fb
14 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavdevice/Makefile
View File

@ -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_JACK_INDEV) += jack.o timefilter.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

2
libavdevice/alsa-audio-common.c → libavdevice/alsa.c
View File

@ -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)
{

6
libavdevice/alsa-audio.h → libavdevice/alsa.h
View File

@ -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"
@ -93,4 +93,4 @@ int ff_alsa_xrun_recover(AVFormatContext *s1, int err);
int ff_alsa_extend_reorder_buf(AlsaData *s, int size);
#endif /* AVDEVICE_ALSA_AUDIO_H */
#endif /* AVDEVICE_ALSA_H */

2
libavdevice/alsa-audio-dec.c → libavdevice/alsa_dec.c
View File

@ -53,7 +53,7 @@
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#include "alsa-audio.h"
#include "alsa.h"
static av_cold int audio_read_header(AVFormatContext *s1)
{

2
libavdevice/alsa-audio-enc.c → libavdevice/alsa_enc.c
View File

@ -43,7 +43,7 @@
#include "libavformat/avformat.h"
#include "alsa-audio.h"
#include "alsa.h"
static av_cold int audio_write_header(AVFormatContext *s1)
{

0
libavdevice/jack_audio.c → libavdevice/jack.c
View File

2
libavdevice/oss_audio.c → libavdevice/oss.c
View File

@ -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)

6
libavdevice/oss_audio.h → libavdevice/oss.h
View File

@ -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 */

2
libavdevice/oss_audio_dec.c → libavdevice/oss_dec.c
View File

@ -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)
{

2
libavdevice/oss_audio_enc.c → libavdevice/oss_enc.c
View File

@ -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)
{

2
libavdevice/sndio_common.c → libavdevice/sndio.c
View File

@ -24,7 +24,7 @@
#include "libavformat/avformat.h"
#include "sndio_common.h"
#include "libavdevice/sndio.h"
static inline void movecb(void *addr, int delta)
{

6
libavdevice/sndio_common.h → libavdevice/sndio.h
View File

@ -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 */

2
libavdevice/sndio_dec.c
View File

@ -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)
{

2
libavdevice/sndio_enc.c
View File

@ -26,7 +26,7 @@
#include "libavformat/avformat.h"
#include "sndio_common.h"
#include "libavdevice/sndio.h"
static av_cold int audio_write_header(AVFormatContext *s1)
{