Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2007-09-07 17:43:40 +0400
committerRamiro Polla <ramiro.polla@gmail.com>2007-09-07 17:43:40 +0400
commit50383e8822dfd6c8c98d76b511a733d1246683bb (patch)
treedbe34ce4d1a97cd0a1f027adf3214b56bb852dc6 /libavformat/beosaudio.cpp
parentbf61632b123cf92864173a6f40b5a0c821f6b078 (diff)
Separate audio_(de)muxer into oss_(de)muxer and audio_beos_(de)muxer
Originally committed as revision 10426 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/beosaudio.cpp')
-rw-r--r--libavformat/beosaudio.cpp8
1 files changed, 4 insertions, 4 deletions
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;
}