MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Separate audio_(de)muxer into oss_(de)muxer and audio_beos_(de)muxer

Browse Source 
Originally committed as revision 10426 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2007-09-07 13:43:40 +00:00
parent bf61632b12
commit 50383e8822
6 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

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

7
libavformat/Makefile
View File

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

3
libavformat/allformats.c
View File

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

6
libavformat/allformats.h
View File

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

8
libavformat/audio.c
View File

@ -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",
"",

8
libavformat/beosaudio.cpp
View File

@ -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;
}