diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavformat/Makefile | 7 | ||||
| -rw-r--r-- | libavformat/allformats.c | 3 | ||||
| -rw-r--r-- | libavformat/allformats.h | 6 | ||||
| -rw-r--r-- | libavformat/audio.c | 8 | ||||
| -rw-r--r-- | libavformat/beosaudio.cpp | 8 |
6 files changed, 22 insertions, 16 deletions
@@ -774,8 +774,8 @@ libxvid_encoder_deps="libxvid" # demuxers / muxers ac3_demuxer_deps="ac3_parser" -audio_demuxer_deps_any="audio_oss audio_beos" -audio_muxer_deps_any="audio_oss audio_beos" +audio_beos_demuxer_deps="audio_beos" +audio_beos_muxer_deps="audio_beos" bktr_demuxer_deps="bktr" dv1394_demuxer_deps="dv1394" libdc1394_demuxer_deps="libdc1394" @@ -783,6 +783,8 @@ libnut_demuxer_deps="libnut" libnut_muxer_deps="libnut" mp3_demuxer_deps="mpegaudio_parser" ogg_muxer_deps="libogg" +oss_demuxer_deps="audio_oss" +oss_muxer_deps="audio_oss" redir_demuxer_deps="network" rtp_muxer_deps="network mpegts_demuxer" rtsp_demuxer_deps="rtp_protocol rtp_muxer" diff --git a/libavformat/Makefile b/libavformat/Makefile index 0d22fcaf9c..c7d4fadd88 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -25,8 +25,6 @@ OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o OBJS-$(CONFIG_AU_DEMUXER) += au.o raw.o OBJS-$(CONFIG_AU_MUXER) += au.o -OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o -OBJS-$(CONFIG_AUDIO_MUXER) += audio.o OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o OBJS-$(CONFIG_AVISYNTH) += avisynth.o @@ -113,6 +111,8 @@ OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \ oggparseogm.o \ riff.o OBJS-$(CONFIG_OGG_MUXER) += ogg.o +OBJS-$(CONFIG_OSS_DEMUXER) += audio.o +OBJS-$(CONFIG_OSS_MUXER) += audio.o OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o @@ -163,7 +163,8 @@ OBJS-$(CONFIG_VHOOK) += framehook.o EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS) -CPPOBJS-$(CONFIG_AUDIO_BEOS) += beosaudio.o +CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o +CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o # protocols I/O OBJS+= avio.o aviobuf.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index c8b7ea5045..b991a93186 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -55,7 +55,7 @@ void av_register_all(void) REGISTER_MUXDEMUX (ASF, asf); REGISTER_MUXER (ASF_STREAM, asf_stream); REGISTER_MUXDEMUX (AU, au); - REGISTER_MUXDEMUX (AUDIO, audio); + REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos); REGISTER_MUXDEMUX (AVI, avi); #ifdef CONFIG_AVISYNTH av_register_input_format(&avisynth_demuxer); @@ -121,6 +121,7 @@ void av_register_all(void) REGISTER_MUXDEMUX (NUT, nut); REGISTER_DEMUXER (NUV, nuv); REGISTER_MUXDEMUX (OGG, ogg); + REGISTER_MUXDEMUX (OSS, oss); REGISTER_MUXDEMUX (PCM_ALAW, pcm_alaw); REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw); REGISTER_MUXDEMUX (PCM_S16BE, pcm_s16be); diff --git a/libavformat/allformats.h b/libavformat/allformats.h index 489839c7c8..1a8509b011 100644 --- a/libavformat/allformats.h +++ b/libavformat/allformats.h @@ -31,7 +31,7 @@ extern AVInputFormat amr_demuxer; extern AVInputFormat apc_demuxer; extern AVInputFormat asf_demuxer; extern AVInputFormat au_demuxer; -extern AVInputFormat audio_demuxer; +extern AVInputFormat audio_beos_demuxer; extern AVInputFormat avi_demuxer; extern AVInputFormat avisynth_demuxer; extern AVInputFormat avs_demuxer; @@ -82,6 +82,7 @@ extern AVInputFormat nsv_demuxer; extern AVInputFormat nut_demuxer; extern AVInputFormat nuv_demuxer; extern AVInputFormat ogg_demuxer; +extern AVInputFormat oss_demuxer; extern AVInputFormat pcm_alaw_demuxer; extern AVInputFormat pcm_mulaw_demuxer; extern AVInputFormat pcm_s16be_demuxer; @@ -125,7 +126,7 @@ extern AVOutputFormat amr_muxer; extern AVOutputFormat asf_muxer; extern AVOutputFormat asf_stream_muxer; extern AVOutputFormat au_muxer; -extern AVOutputFormat audio_muxer; +extern AVOutputFormat audio_beos_muxer; extern AVOutputFormat avi_muxer; extern AVOutputFormat crc_muxer; extern AVOutputFormat dv_muxer; @@ -164,6 +165,7 @@ extern AVOutputFormat mpjpeg_muxer; extern AVOutputFormat null_muxer; extern AVOutputFormat nut_muxer; extern AVOutputFormat ogg_muxer; +extern AVOutputFormat oss_muxer; extern AVOutputFormat pcm_alaw_muxer; extern AVOutputFormat pcm_mulaw_muxer; extern AVOutputFormat pcm_s16be_muxer; diff --git a/libavformat/audio.c b/libavformat/audio.c index ce209d1a9f..8c5df94be5 100644 --- a/libavformat/audio.c +++ b/libavformat/audio.c @@ -307,8 +307,8 @@ static int audio_read_close(AVFormatContext *s1) return 0; } -#ifdef CONFIG_AUDIO_DEMUXER -AVInputFormat audio_demuxer = { +#ifdef CONFIG_OSS_DEMUXER +AVInputFormat oss_demuxer = { "audio_device", "audio grab and output", sizeof(AudioData), @@ -320,8 +320,8 @@ AVInputFormat audio_demuxer = { }; #endif -#ifdef CONFIG_AUDIO_MUXER -AVOutputFormat audio_muxer = { +#ifdef CONFIG_OSS_MUXER +AVOutputFormat oss_muxer = { "audio_device", "audio grab and output", "", diff --git a/libavformat/beosaudio.cpp b/libavformat/beosaudio.cpp index 6c16f0048c..48e01d86bd 100644 --- a/libavformat/beosaudio.cpp +++ b/libavformat/beosaudio.cpp @@ -421,7 +421,7 @@ static int audio_read_close(AVFormatContext *s1) return 0; } -static AVInputFormat audio_demuxer = { +static AVInputFormat audio_beos_demuxer = { "audio_device", "audio grab and output", sizeof(AudioData), @@ -433,7 +433,7 @@ static AVInputFormat audio_demuxer = { AVFMT_NOFILE, }; -AVOutputFormat audio_muxer = { +AVOutputFormat audio_beos_muxer = { "audio_device", "audio grab and output", "", @@ -456,8 +456,8 @@ extern "C" { int audio_init(void) { main_thid = find_thread(NULL); - av_register_input_format(&audio_demuxer); - av_register_output_format(&audio_muxer); + av_register_input_format(&audio_beos_demuxer); + av_register_output_format(&audio_beos_muxer); return 0; } |