From c6610a216ed2948885772154a2eed696e0cb4aca Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Tue, 25 Jan 2011 22:03:28 +0000 Subject: 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. --- libavdevice/alldevices.c | 8 ++++---- libavdevice/alsa-audio-dec.c | 2 +- libavdevice/alsa-audio-enc.c | 2 +- libavdevice/bktr.c | 2 +- libavdevice/dv1394.c | 2 +- libavdevice/jack_audio.c | 2 +- libavdevice/libdc1394.c | 4 ++-- libavdevice/oss_audio.c | 4 ++-- libavdevice/v4l.c | 2 +- libavdevice/v4l2.c | 2 +- libavdevice/vfwcap.c | 2 +- libavdevice/x11grab.c | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) (limited to 'libavdevice') diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index de3bc82396..ce06bf269c 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -23,11 +23,11 @@ #include "avdevice.h" #define REGISTER_OUTDEV(X,x) { \ - extern AVOutputFormat x##_muxer; \ - if(CONFIG_##X##_OUTDEV) av_register_output_format(&x##_muxer); } + extern AVOutputFormat ff_##x##_muxer; \ + if(CONFIG_##X##_OUTDEV) av_register_output_format(&ff_##x##_muxer); } #define REGISTER_INDEV(X,x) { \ - extern AVInputFormat x##_demuxer; \ - if(CONFIG_##X##_INDEV) av_register_input_format(&x##_demuxer); } + extern AVInputFormat ff_##x##_demuxer; \ + if(CONFIG_##X##_INDEV) av_register_input_format(&ff_##x##_demuxer); } #define REGISTER_INOUTDEV(X,x) REGISTER_OUTDEV(X,x); REGISTER_INDEV(X,x) void avdevice_register_all(void) diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c index f1dd29bafc..8ee0e52642 100644 --- a/libavdevice/alsa-audio-dec.c +++ b/libavdevice/alsa-audio-dec.c @@ -163,7 +163,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt) return 0; } -AVInputFormat alsa_demuxer = { +AVInputFormat ff_alsa_demuxer = { "alsa", NULL_IF_CONFIG_SMALL("ALSA audio input"), sizeof(AlsaData), diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c index 7c07bf722e..83a179ecfe 100644 --- a/libavdevice/alsa-audio-enc.c +++ b/libavdevice/alsa-audio-enc.c @@ -93,7 +93,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt) return 0; } -AVOutputFormat alsa_muxer = { +AVOutputFormat ff_alsa_muxer = { "alsa", NULL_IF_CONFIG_SMALL("ALSA audio output"), "", diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index afb94b6c5d..cec79a4989 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -314,7 +314,7 @@ static int grab_read_close(AVFormatContext *s1) return 0; } -AVInputFormat bktr_demuxer = { +AVInputFormat ff_bktr_demuxer = { "bktr", NULL_IF_CONFIG_SMALL("video grab"), sizeof(VideoData), diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index a55fa97cef..588f35662b 100644 --- a/libavdevice/dv1394.c +++ b/libavdevice/dv1394.c @@ -227,7 +227,7 @@ static int dv1394_close(AVFormatContext * context) return 0; } -AVInputFormat dv1394_demuxer = { +AVInputFormat ff_dv1394_demuxer = { .name = "dv1394", .long_name = NULL_IF_CONFIG_SMALL("DV1394 A/V grab"), .priv_data_size = sizeof(struct dv1394_data), diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c index b41bbdf902..9062e7f2dd 100644 --- a/libavdevice/jack_audio.c +++ b/libavdevice/jack_audio.c @@ -314,7 +314,7 @@ static int audio_read_close(AVFormatContext *context) return 0; } -AVInputFormat jack_demuxer = { +AVInputFormat ff_jack_demuxer = { "jack", NULL_IF_CONFIG_SMALL("JACK Audio Connection Kit"), sizeof(JackData), diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 1f35135a65..abd82dc981 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -348,7 +348,7 @@ static int dc1394_v2_close(AVFormatContext * context) return 0; } -AVInputFormat libdc1394_demuxer = { +AVInputFormat ff_libdc1394_demuxer = { .name = "libdc1394", .long_name = NULL_IF_CONFIG_SMALL("dc1394 v.2 A/V grab"), .priv_data_size = sizeof(struct dc1394_data), @@ -360,7 +360,7 @@ AVInputFormat libdc1394_demuxer = { #endif #if HAVE_LIBDC1394_1 -AVInputFormat libdc1394_demuxer = { +AVInputFormat ff_libdc1394_demuxer = { .name = "libdc1394", .long_name = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"), .priv_data_size = sizeof(struct dc1394_data), 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"), "", diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index f640c769cd..c107684bff 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -339,7 +339,7 @@ static int grab_read_close(AVFormatContext *s1) return 0; } -AVInputFormat v4l_demuxer = { +AVInputFormat ff_v4l_demuxer = { "video4linux", NULL_IF_CONFIG_SMALL("Video4Linux device grab"), sizeof(VideoData), diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 1e41c44775..993e2adcec 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -680,7 +680,7 @@ static int v4l2_read_close(AVFormatContext *s1) return 0; } -AVInputFormat v4l2_demuxer = { +AVInputFormat ff_v4l2_demuxer = { "video4linux2", NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"), sizeof(struct video_data), diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 7b54490fbb..2155db6ece 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -452,7 +452,7 @@ static int vfw_read_packet(AVFormatContext *s, AVPacket *pkt) return pkt->size; } -AVInputFormat vfwcap_demuxer = { +AVInputFormat ff_vfwcap_demuxer = { "vfwcap", NULL_IF_CONFIG_SMALL("VFW video capture"), sizeof(struct vfw_ctx), diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index ee3b8e901e..be0586a7db 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -442,7 +442,7 @@ x11grab_read_close(AVFormatContext *s1) } /** x11 grabber device demuxer declaration */ -AVInputFormat x11_grab_device_demuxer = +AVInputFormat ff_x11_grab_device_demuxer = { "x11grab", NULL_IF_CONFIG_SMALL("X11grab"), -- cgit v1.2.3