summaryrefslogtreecommitdiff
path: root/libavdevice/oss_audio.c
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gmail.com>2011-01-25 22:03:28 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-01-28 03:15:34 +0100
commit66355be3c3eb8e797589058b0773f773a8c2231e (patch)
tree8dfe2254904eafda194acc98c465bf2ece7f69a6 /libavdevice/oss_audio.c
parentebf3ee16c765811fe3ab0c8a295ada0e2f5eca44 (diff)
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
Diffstat (limited to 'libavdevice/oss_audio.c')
-rw-r--r--libavdevice/oss_audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index 9d007108e6..d2ba601f7a 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -293,7 +293,7 @@ static int audio_read_close(AVFormatContext *s1)
}
#if CONFIG_OSS_INDEV
-AVInputFormat oss_demuxer = {
+AVInputFormat ff_oss_demuxer = {
"oss",
NULL_IF_CONFIG_SMALL("Open Sound System capture"),
sizeof(AudioData),
@@ -306,7 +306,7 @@ AVInputFormat oss_demuxer = {
#endif
#if CONFIG_OSS_OUTDEV
-AVOutputFormat oss_muxer = {
+AVOutputFormat ff_oss_muxer = {
"oss",
NULL_IF_CONFIG_SMALL("Open Sound System playback"),
"",