Commit c6610a21 authored by Diego Elio Pettenò's avatar Diego Elio Pettenò Committed by Mans Rullgard
Browse files

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.
parent 225b6d7f
......@@ -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)
......
......@@ -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),
......
......@@ -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"),
"",
......
......@@ -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),
......
......@@ -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),
......
......@@ -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),
......
......@@ -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),
......
......@@ -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"),
"",
......
......@@ -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),
......
......@@ -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),
......
......@@ -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),
......
......@@ -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"),
......
......@@ -343,7 +343,7 @@ static int fourxm_read_close(AVFormatContext *s)
return 0;
}
AVInputFormat fourxm_demuxer = {
AVInputFormat ff_fourxm_demuxer = {
"4xm",
NULL_IF_CONFIG_SMALL("4X Technologies format"),
sizeof(FourxmDemuxContext),
......
......@@ -164,7 +164,7 @@ static int a64_write_trailer(struct AVFormatContext *s)
return 0;
}
AVOutputFormat a64_muxer = {
AVOutputFormat ff_a64_muxer = {
.name = "a64",
.long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
.mime_type = NULL,
......
......@@ -81,7 +81,7 @@ static int adts_aac_read_header(AVFormatContext *s,
return 0;
}
AVInputFormat aac_demuxer = {
AVInputFormat ff_aac_demuxer = {
"aac",
NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
0,
......
......@@ -70,7 +70,7 @@ static int ac3_probe(AVProbeData *p)
return ac3_eac3_probe(p, CODEC_ID_AC3);
}
AVInputFormat ac3_demuxer = {
AVInputFormat ff_ac3_demuxer = {
"ac3",
NULL_IF_CONFIG_SMALL("raw AC-3"),
0,
......@@ -89,7 +89,7 @@ static int eac3_probe(AVProbeData *p)
return ac3_eac3_probe(p, CODEC_ID_EAC3);
}
AVInputFormat eac3_demuxer = {
AVInputFormat ff_eac3_demuxer = {
"eac3",
NULL_IF_CONFIG_SMALL("raw E-AC-3"),
0,
......
......@@ -137,7 +137,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVOutputFormat adts_muxer = {
AVOutputFormat ff_adts_muxer = {
"adts",
NULL_IF_CONFIG_SMALL("ADTS AAC"),
"audio/aac",
......
......@@ -93,7 +93,7 @@ static int aea_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
}
AVInputFormat aea_demuxer = {
AVInputFormat ff_aea_demuxer = {
"aea",
NULL_IF_CONFIG_SMALL("MD STUDIO audio"),
0,
......
......@@ -311,7 +311,7 @@ static int aiff_read_packet(AVFormatContext *s,
return 0;
}
AVInputFormat aiff_demuxer = {
AVInputFormat ff_aiff_demuxer = {
"aiff",
NULL_IF_CONFIG_SMALL("Audio IFF"),
sizeof(AIFFInputContext),
......
......@@ -145,7 +145,7 @@ static int aiff_write_trailer(AVFormatContext *s)
return 0;
}
AVOutputFormat aiff_muxer = {
AVOutputFormat ff_aiff_muxer = {
"aiff",
NULL_IF_CONFIG_SMALL("Audio IFF"),
"audio/aiff",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment