[FFmpeg-devel] [PATCH 1/2] Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

Diego Elio Pettenò flameeyes
Wed Jan 26 00:03:28 CET 2011


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 +-
 libavformat/4xm.c            |    2 +-
 libavformat/a64.c            |    2 +-
 libavformat/aacdec.c         |    2 +-
 libavformat/ac3dec.c         |    4 ++--
 libavformat/adtsenc.c        |    2 +-
 libavformat/aea.c            |    2 +-
 libavformat/aiffdec.c        |    2 +-
 libavformat/aiffenc.c        |    2 +-
 libavformat/allformats.c     |   12 ++++++------
 libavformat/amr.c            |    4 ++--
 libavformat/anm.c            |    2 +-
 libavformat/apc.c            |    2 +-
 libavformat/ape.c            |    2 +-
 libavformat/applehttp.c      |    2 +-
 libavformat/asf.h            |    2 +-
 libavformat/asfdec.c         |    2 +-
 libavformat/asfenc.c         |    4 ++--
 libavformat/assdec.c         |    2 +-
 libavformat/assenc.c         |    2 +-
 libavformat/au.c             |    4 ++--
 libavformat/avidec.c         |    2 +-
 libavformat/avienc.c         |    2 +-
 libavformat/avisynth.c       |    2 +-
 libavformat/avs.c            |    2 +-
 libavformat/bethsoftvid.c    |    2 +-
 libavformat/bfi.c            |    2 +-
 libavformat/bink.c           |    2 +-
 libavformat/c93.c            |    2 +-
 libavformat/cafdec.c         |    2 +-
 libavformat/cavsvideodec.c   |    2 +-
 libavformat/cdg.c            |    2 +-
 libavformat/concat.c         |    2 +-
 libavformat/crcenc.c         |    2 +-
 libavformat/daud.c           |    4 ++--
 libavformat/diracdec.c       |    2 +-
 libavformat/dnxhddec.c       |    2 +-
 libavformat/dsicin.c         |    2 +-
 libavformat/dtsdec.c         |    2 +-
 libavformat/dv.c             |    2 +-
 libavformat/dvenc.c          |    2 +-
 libavformat/dxa.c            |    2 +-
 libavformat/eacdata.c        |    2 +-
 libavformat/electronicarts.c |    2 +-
 libavformat/ffmdec.c         |    2 +-
 libavformat/ffmenc.c         |    2 +-
 libavformat/ffmetadec.c      |    2 +-
 libavformat/ffmetaenc.c      |    2 +-
 libavformat/file.c           |    4 ++--
 libavformat/filmstripdec.c   |    2 +-
 libavformat/filmstripenc.c   |    2 +-
 libavformat/flacdec.c        |    2 +-
 libavformat/flacenc.c        |    2 +-
 libavformat/flic.c           |    2 +-
 libavformat/flvdec.c         |    2 +-
 libavformat/flvenc.c         |    2 +-
 libavformat/framecrcenc.c    |    2 +-
 libavformat/gif.c            |    2 +-
 libavformat/gopher.c         |    2 +-
 libavformat/gxf.c            |    2 +-
 libavformat/gxfenc.c         |    2 +-
 libavformat/h261dec.c        |    2 +-
 libavformat/h263dec.c        |    2 +-
 libavformat/h264dec.c        |    2 +-
 libavformat/http.c           |    2 +-
 libavformat/idcin.c          |    2 +-
 libavformat/idroqdec.c       |    2 +-
 libavformat/idroqenc.c       |    2 +-
 libavformat/iff.c            |    2 +-
 libavformat/img2.c           |    8 ++++----
 libavformat/ingenientdec.c   |    2 +-
 libavformat/ipmovie.c        |    2 +-
 libavformat/iss.c            |    2 +-
 libavformat/iv8.c            |    2 +-
 libavformat/ivfdec.c         |    2 +-
 libavformat/ivfenc.c         |    2 +-
 libavformat/libnut.c         |    4 ++--
 libavformat/librtmp.c        |   10 +++++-----
 libavformat/lmlm4.c          |    2 +-
 libavformat/lxfdec.c         |    2 +-
 libavformat/m4vdec.c         |    2 +-
 libavformat/matroskadec.c    |    2 +-
 libavformat/matroskaenc.c    |    6 +++---
 libavformat/md5enc.c         |    4 ++--
 libavformat/md5proto.c       |    2 +-
 libavformat/mm.c             |    2 +-
 libavformat/mmf.c            |    4 ++--
 libavformat/mmsh.c           |    2 +-
 libavformat/mmst.c           |    2 +-
 libavformat/mov.c            |    2 +-
 libavformat/movenc.c         |   12 ++++++------
 libavformat/mp3dec.c         |    2 +-
 libavformat/mp3enc.c         |    4 ++--
 libavformat/mpc.c            |    2 +-
 libavformat/mpc8.c           |    2 +-
 libavformat/mpeg.c           |    2 +-
 libavformat/mpegenc.c        |   30 +++++++++++++++---------------
 libavformat/mpegts.c         |    8 ++++----
 libavformat/mpegtsenc.c      |    2 +-
 libavformat/mpegvideodec.c   |    2 +-
 libavformat/mpjpeg.c         |    2 +-
 libavformat/msnwc_tcp.c      |    2 +-
 libavformat/mtv.c            |    2 +-
 libavformat/mvi.c            |    2 +-
 libavformat/mxfdec.c         |    2 +-
 libavformat/mxfenc.c         |   16 ++++++++--------
 libavformat/mxg.c            |    2 +-
 libavformat/ncdec.c          |    2 +-
 libavformat/nsvdec.c         |    2 +-
 libavformat/nullenc.c        |    2 +-
 libavformat/nutdec.c         |    2 +-
 libavformat/nutenc.c         |    2 +-
 libavformat/nuv.c            |    2 +-
 libavformat/oggdec.c         |    2 +-
 libavformat/oggenc.c         |    2 +-
 libavformat/oma.c            |    2 +-
 libavformat/pcmdec.c         |    2 +-
 libavformat/pcmenc.c         |    2 +-
 libavformat/psxstr.c         |    2 +-
 libavformat/pva.c            |    2 +-
 libavformat/qcp.c            |    2 +-
 libavformat/r3d.c            |    2 +-
 libavformat/rawdec.c         |   14 +++++++-------
 libavformat/rawenc.c         |   36 ++++++++++++++++++------------------
 libavformat/rawvideodec.c    |    2 +-
 libavformat/rdt.c            |    2 +-
 libavformat/rl2.c            |    2 +-
 libavformat/rm.h             |    2 +-
 libavformat/rmdec.c          |    4 ++--
 libavformat/rmenc.c          |    2 +-
 libavformat/rpl.c            |    2 +-
 libavformat/rsodec.c         |    2 +-
 libavformat/rsoenc.c         |    2 +-
 libavformat/rtmpproto.c      |    2 +-
 libavformat/rtpdec_asf.c     |    2 +-
 libavformat/rtpenc.c         |    2 +-
 libavformat/rtpproto.c       |    2 +-
 libavformat/rtsp.c           |    4 ++--
 libavformat/rtspdec.c        |    2 +-
 libavformat/rtspenc.c        |    2 +-
 libavformat/sapdec.c         |    2 +-
 libavformat/sapenc.c         |    2 +-
 libavformat/segafilm.c       |    2 +-
 libavformat/sierravmd.c      |    2 +-
 libavformat/siff.c           |    2 +-
 libavformat/smacker.c        |    2 +-
 libavformat/sol.c            |    2 +-
 libavformat/soxdec.c         |    2 +-
 libavformat/soxenc.c         |    2 +-
 libavformat/spdifdec.c       |    2 +-
 libavformat/spdifenc.c       |    2 +-
 libavformat/srtdec.c         |    2 +-
 libavformat/swfdec.c         |    2 +-
 libavformat/swfenc.c         |    4 ++--
 libavformat/tcp.c            |    2 +-
 libavformat/thp.c            |    2 +-
 libavformat/tiertexseq.c     |    2 +-
 libavformat/tmv.c            |    2 +-
 libavformat/tta.c            |    2 +-
 libavformat/tty.c            |    2 +-
 libavformat/txd.c            |    2 +-
 libavformat/udp.c            |    2 +-
 libavformat/vc1test.c        |    2 +-
 libavformat/vc1testenc.c     |    2 +-
 libavformat/vocdec.c         |    2 +-
 libavformat/vocenc.c         |    2 +-
 libavformat/vqf.c            |    2 +-
 libavformat/wav.c            |    6 +++---
 libavformat/wc3movie.c       |    2 +-
 libavformat/westwood.c       |    4 ++--
 libavformat/wtv.c            |    2 +-
 libavformat/wv.c             |    2 +-
 libavformat/xa.c             |    2 +-
 libavformat/yop.c            |    2 +-
 libavformat/yuv4mpeg.c       |    4 ++--
 186 files changed, 274 insertions(+), 274 deletions(-)

diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index de3bc82..ce06bf2 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 f1dd29b..8ee0e52 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 7c07bf7..83a179e 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 afb94b6..cec79a4 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 a55fa97..588f356 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 b41bbdf..9062e7f 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 1f35135..abd82dc 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 9d00710..d2ba601 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 f640c76..c107684 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 1e41c44..993e2ad 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 7b54490..2155db6 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 ee3b8e9..be0586a 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"),
diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index dfbf032..6f737e3 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -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),
diff --git a/libavformat/a64.c b/libavformat/a64.c
index 2dc475c..46441b2 100644
--- a/libavformat/a64.c
+++ b/libavformat/a64.c
@@ -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,
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 64ac3d1..47e9bf3 100644
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -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,
diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c
index b8a2bdd..fcf9936 100644
--- a/libavformat/ac3dec.c
+++ b/libavformat/ac3dec.c
@@ -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,
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 232d322..f309c89 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -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",
diff --git a/libavformat/aea.c b/libavformat/aea.c
index 2c4f471..6816506 100644
--- a/libavformat/aea.c
+++ b/libavformat/aea.c
@@ -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,
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 255caa3..b841023 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -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),
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index e3c6a0b..6e47390 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -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",
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 5fa97ef..0ff4b5a 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -23,18 +23,18 @@
 #include "rdt.h"
 
 #define REGISTER_MUXER(X,x) { \
-    extern AVOutputFormat x##_muxer; \
-    if(CONFIG_##X##_MUXER) av_register_output_format(&x##_muxer); }
+    extern AVOutputFormat ff_##x##_muxer; \
+    if(CONFIG_##X##_MUXER) av_register_output_format(&ff_##x##_muxer); }
 
 #define REGISTER_DEMUXER(X,x) { \
-    extern AVInputFormat x##_demuxer; \
-    if(CONFIG_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
+    extern AVInputFormat ff_##x##_demuxer; \
+    if(CONFIG_##X##_DEMUXER) av_register_input_format(&ff_##x##_demuxer); }
 
 #define REGISTER_MUXDEMUX(X,x)  REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
 
 #define REGISTER_PROTOCOL(X,x) { \
-    extern URLProtocol x##_protocol; \
-    if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&x##_protocol, sizeof(x##_protocol)); }
+    extern URLProtocol ff_##x##_protocol; \
+    if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&ff_##x##_protocol, sizeof(ff_##x##_protocol)); }
 
 void av_register_all(void)
 {
diff --git a/libavformat/amr.c b/libavformat/amr.c
index f78aacc..11bb4e5 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -169,7 +169,7 @@ static int amr_read_packet(AVFormatContext *s,
 }
 
 #if CONFIG_AMR_DEMUXER
-AVInputFormat amr_demuxer = {
+AVInputFormat ff_amr_demuxer = {
     "amr",
     NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
     0, /*priv_data_size*/
@@ -181,7 +181,7 @@ AVInputFormat amr_demuxer = {
 #endif
 
 #if CONFIG_AMR_MUXER
-AVOutputFormat amr_muxer = {
+AVOutputFormat ff_amr_muxer = {
     "amr",
     NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
     "audio/amr",
diff --git a/libavformat/anm.c b/libavformat/anm.c
index 82430e5..dbe1b68 100644
--- a/libavformat/anm.c
+++ b/libavformat/anm.c
@@ -225,7 +225,7 @@ repeat:
     return 0;
 }
 
-AVInputFormat anm_demuxer = {
+AVInputFormat ff_anm_demuxer = {
     "anm",
     NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
     sizeof(AnmDemuxContext),
diff --git a/libavformat/apc.c b/libavformat/apc.c
index 9b4a8ad..942a4cf 100644
--- a/libavformat/apc.c
+++ b/libavformat/apc.c
@@ -80,7 +80,7 @@ static int apc_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat apc_demuxer = {
+AVInputFormat ff_apc_demuxer = {
     "apc",
     NULL_IF_CONFIG_SMALL("CRYO APC format"),
     0,
diff --git a/libavformat/ape.c b/libavformat/ape.c
index 91acf72..327e1a9 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -391,7 +391,7 @@ static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
     return 0;
 }
 
-AVInputFormat ape_demuxer = {
+AVInputFormat ff_ape_demuxer = {
     "ape",
     NULL_IF_CONFIG_SMALL("Monkey's Audio"),
     sizeof(APEContext),
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c
index 6f03548..50466fa 100644
--- a/libavformat/applehttp.c
+++ b/libavformat/applehttp.c
@@ -579,7 +579,7 @@ static int applehttp_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat applehttp_demuxer = {
+AVInputFormat ff_applehttp_demuxer = {
     "applehttp",
     NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming format"),
     sizeof(AppleHTTPContext),
diff --git a/libavformat/asf.h b/libavformat/asf.h
index 8cf517d..f336c43 100644
--- a/libavformat/asf.h
+++ b/libavformat/asf.h
@@ -229,7 +229,7 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
 
 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
 
-extern AVInputFormat asf_demuxer;
+extern AVInputFormat ff_asf_demuxer;
 int ff_guidcmp(const void *g1, const void *g2);
 void ff_get_guid(ByteIOContext *s, ff_asf_guid *g);
 
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 36690ae..229f8ba 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1203,7 +1203,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
     return 0;
 }
 
-AVInputFormat asf_demuxer = {
+AVInputFormat ff_asf_demuxer = {
     "asf",
     NULL_IF_CONFIG_SMALL("ASF format"),
     sizeof(ASFContext),
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index 0c2a6ae..b8f8635 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -855,7 +855,7 @@ static int asf_write_trailer(AVFormatContext *s)
 }
 
 #if CONFIG_ASF_MUXER
-AVOutputFormat asf_muxer = {
+AVOutputFormat ff_asf_muxer = {
     "asf",
     NULL_IF_CONFIG_SMALL("ASF format"),
     "video/x-ms-asf",
@@ -876,7 +876,7 @@ AVOutputFormat asf_muxer = {
 #endif
 
 #if CONFIG_ASF_STREAM_MUXER
-AVOutputFormat asf_stream_muxer = {
+AVOutputFormat ff_asf_stream_muxer = {
     "asf_stream",
     NULL_IF_CONFIG_SMALL("ASF format"),
     "video/x-ms-asf",
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index ffce157..86f0339 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -202,7 +202,7 @@ static int read_seek2(AVFormatContext *s, int stream_index,
     return 0;
 }
 
-AVInputFormat ass_demuxer = {
+AVInputFormat ff_ass_demuxer = {
     .name           = "ass",
     .long_name      = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
     .priv_data_size = sizeof(ASSContext),
diff --git a/libavformat/assenc.c b/libavformat/assenc.c
index bc1d7de..fdd5306 100644
--- a/libavformat/assenc.c
+++ b/libavformat/assenc.c
@@ -77,7 +77,7 @@ static int write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat ass_muxer = {
+AVOutputFormat ff_ass_muxer = {
     .name           = "ass",
     .long_name      = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
     .mime_type      = "text/x-ssa",
diff --git a/libavformat/au.c b/libavformat/au.c
index cb1c31d..e18022d 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -183,7 +183,7 @@ static int au_read_packet(AVFormatContext *s,
 }
 
 #if CONFIG_AU_DEMUXER
-AVInputFormat au_demuxer = {
+AVInputFormat ff_au_demuxer = {
     "au",
     NULL_IF_CONFIG_SMALL("SUN AU format"),
     0,
@@ -197,7 +197,7 @@ AVInputFormat au_demuxer = {
 #endif
 
 #if CONFIG_AU_MUXER
-AVOutputFormat au_muxer = {
+AVOutputFormat ff_au_muxer = {
     "au",
     NULL_IF_CONFIG_SMALL("SUN AU format"),
     "audio/basic",
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index d02e188..312bf76 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1373,7 +1373,7 @@ static int avi_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat avi_demuxer = {
+AVInputFormat ff_avi_demuxer = {
     "avi",
     NULL_IF_CONFIG_SMALL("AVI format"),
     sizeof(AVIContext),
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 98b0ad7..3397657 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -630,7 +630,7 @@ static int avi_write_trailer(AVFormatContext *s)
     return res;
 }
 
-AVOutputFormat avi_muxer = {
+AVOutputFormat ff_avi_muxer = {
     "avi",
     NULL_IF_CONFIG_SMALL("AVI format"),
     "video/x-msvideo",
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index e2a8a3c..768459a 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -207,7 +207,7 @@ static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts,
   return 0;
 }
 
-AVInputFormat avisynth_demuxer = {
+AVInputFormat ff_avisynth_demuxer = {
   "avs",
   NULL_IF_CONFIG_SMALL("AVISynth"),
   sizeof(AVISynthContext),
diff --git a/libavformat/avs.c b/libavformat/avs.c
index caf3a89..2e1b224 100644
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -215,7 +215,7 @@ static int avs_read_close(AVFormatContext * s)
     return 0;
 }
 
-AVInputFormat avs_demuxer = {
+AVInputFormat ff_avs_demuxer = {
     "avs",
     NULL_IF_CONFIG_SMALL("AVS format"),
     sizeof(AvsFormat),
diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c
index 4f9d1c1..97e8e7e 100644
--- a/libavformat/bethsoftvid.c
+++ b/libavformat/bethsoftvid.c
@@ -224,7 +224,7 @@ static int vid_read_packet(AVFormatContext *s,
     return 0;
 }
 
-AVInputFormat bethsoftvid_demuxer = {
+AVInputFormat ff_bethsoftvid_demuxer = {
     "bethsoftvid",
     NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"),
     sizeof(BVID_DemuxContext),
diff --git a/libavformat/bfi.c b/libavformat/bfi.c
index 94014a4..3b1c9aa 100644
--- a/libavformat/bfi.c
+++ b/libavformat/bfi.c
@@ -158,7 +158,7 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt)
     return ret;
 }
 
-AVInputFormat bfi_demuxer = {
+AVInputFormat ff_bfi_demuxer = {
     "bfi",
     NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
     sizeof(BFIContext),
diff --git a/libavformat/bink.c b/libavformat/bink.c
index afa629f..c134dd8 100644
--- a/libavformat/bink.c
+++ b/libavformat/bink.c
@@ -257,7 +257,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, in
     return 0;
 }
 
-AVInputFormat bink_demuxer = {
+AVInputFormat ff_bink_demuxer = {
     "bink",
     NULL_IF_CONFIG_SMALL("Bink"),
     sizeof(BinkDemuxContext),
diff --git a/libavformat/c93.c b/libavformat/c93.c
index 033b36b..dbb2bf3 100644
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -192,7 +192,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat c93_demuxer = {
+AVInputFormat ff_c93_demuxer = {
     "c93",
     NULL_IF_CONFIG_SMALL("Interplay C93"),
     sizeof(C93DemuxContext),
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 201c5f2..7b0c871 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -381,7 +381,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
     return 0;
 }
 
-AVInputFormat caf_demuxer = {
+AVInputFormat ff_caf_demuxer = {
     "caf",
     NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),
     sizeof(CaffContext),
diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c
index 51a7501..6db9ad9 100644
--- a/libavformat/cavsvideodec.c
+++ b/libavformat/cavsvideodec.c
@@ -65,7 +65,7 @@ static int cavsvideo_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat cavsvideo_demuxer = {
+AVInputFormat ff_cavsvideo_demuxer = {
     "cavsvideo",
     NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
     0,
diff --git a/libavformat/cdg.c b/libavformat/cdg.c
index 2f4fb27..ed3d782 100644
--- a/libavformat/cdg.c
+++ b/libavformat/cdg.c
@@ -55,7 +55,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat cdg_demuxer = {
+AVInputFormat ff_cdg_demuxer = {
     "cdg",
     NULL_IF_CONFIG_SMALL("CD Graphics Format"),
     0,
diff --git a/libavformat/concat.c b/libavformat/concat.c
index 3a19d0a..3659079 100644
--- a/libavformat/concat.c
+++ b/libavformat/concat.c
@@ -188,7 +188,7 @@ static int64_t concat_seek(URLContext *h, int64_t pos, int whence)
     return result;
 }
 
-URLProtocol concat_protocol = {
+URLProtocol ff_concat_protocol = {
     "concat",
     concat_open,
     concat_read,
diff --git a/libavformat/crcenc.c b/libavformat/crcenc.c
index b343464..2f9a099 100644
--- a/libavformat/crcenc.c
+++ b/libavformat/crcenc.c
@@ -54,7 +54,7 @@ static int crc_write_trailer(struct AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat crc_muxer = {
+AVOutputFormat ff_crc_muxer = {
     "crc",
     NULL_IF_CONFIG_SMALL("CRC testing format"),
     NULL,
diff --git a/libavformat/daud.c b/libavformat/daud.c
index 9b0e008..c8af2e4 100644
--- a/libavformat/daud.c
+++ b/libavformat/daud.c
@@ -65,7 +65,7 @@ static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 }
 
 #if CONFIG_DAUD_DEMUXER
-AVInputFormat daud_demuxer = {
+AVInputFormat ff_daud_demuxer = {
     "daud",
     NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
     0,
@@ -79,7 +79,7 @@ AVInputFormat daud_demuxer = {
 #endif
 
 #if CONFIG_DAUD_MUXER
-AVOutputFormat daud_muxer =
+AVOutputFormat ff_daud_muxer =
 {
     "daud",
     NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
diff --git a/libavformat/diracdec.c b/libavformat/diracdec.c
index aa887e7..6c68961 100644
--- a/libavformat/diracdec.c
+++ b/libavformat/diracdec.c
@@ -31,7 +31,7 @@ static int dirac_probe(AVProbeData *p)
         return 0;
 }
 
-AVInputFormat dirac_demuxer = {
+AVInputFormat ff_dirac_demuxer = {
     "dirac",
     NULL_IF_CONFIG_SMALL("raw Dirac"),
     0,
diff --git a/libavformat/dnxhddec.c b/libavformat/dnxhddec.c
index edd44fe..035e1c4 100644
--- a/libavformat/dnxhddec.c
+++ b/libavformat/dnxhddec.c
@@ -42,7 +42,7 @@ static int dnxhd_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-AVInputFormat dnxhd_demuxer = {
+AVInputFormat ff_dnxhd_demuxer = {
     "dnxhd",
     NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
     0,
diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c
index af5e2d9..10a2a9d 100644
--- a/libavformat/dsicin.c
+++ b/libavformat/dsicin.c
@@ -216,7 +216,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat dsicin_demuxer = {
+AVInputFormat ff_dsicin_demuxer = {
     "dsicin",
     NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"),
     sizeof(CinDemuxContext),
diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c
index c132c08..b203597 100644
--- a/libavformat/dtsdec.c
+++ b/libavformat/dtsdec.c
@@ -65,7 +65,7 @@ static int dts_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat dts_demuxer = {
+AVInputFormat ff_dts_demuxer = {
     "dts",
     NULL_IF_CONFIG_SMALL("raw DTS"),
     0,
diff --git a/libavformat/dv.c b/libavformat/dv.c
index d7f54d6..1f05eb2 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -518,7 +518,7 @@ static int dv_probe(AVProbeData *p)
 }
 
 #if CONFIG_DV_DEMUXER
-AVInputFormat dv_demuxer = {
+AVInputFormat ff_dv_demuxer = {
     "dv",
     NULL_IF_CONFIG_SMALL("DV video format"),
     sizeof(RawDVContext),
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index e48d8d0..faaa529 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -399,7 +399,7 @@ static int dv_write_trailer(struct AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat dv_muxer = {
+AVOutputFormat ff_dv_muxer = {
     "dv",
     NULL_IF_CONFIG_SMALL("DV video format"),
     NULL,
diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index c00c917..6ad4582 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -209,7 +209,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
     return AVERROR(EIO);
 }
 
-AVInputFormat dxa_demuxer = {
+AVInputFormat ff_dxa_demuxer = {
     "dxa",
     NULL_IF_CONFIG_SMALL("DXA"),
     sizeof(DXAContext),
diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index 32c3343..809b190 100644
--- a/libavformat/eacdata.c
+++ b/libavformat/eacdata.c
@@ -90,7 +90,7 @@ static int cdata_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat ea_cdata_demuxer = {
+AVInputFormat ff_ea_cdata_demuxer = {
     "ea_cdata",
     NULL_IF_CONFIG_SMALL("Electronic Arts cdata"),
     sizeof(CdataDemuxContext),
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index b796ede..5408a1f 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -568,7 +568,7 @@ get_video_packet:
     return ret;
 }
 
-AVInputFormat ea_demuxer = {
+AVInputFormat ff_ea_demuxer = {
     "ea",
     NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"),
     sizeof(EaDemuxContext),
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 050702e..b2fc0cd 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -518,7 +518,7 @@ static int ffm_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat ffm_demuxer = {
+AVInputFormat ff_ffm_demuxer = {
     "ffm",
     NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
     sizeof(FFMContext),
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
index 10c0f11..f9e0782 100644
--- a/libavformat/ffmenc.c
+++ b/libavformat/ffmenc.c
@@ -240,7 +240,7 @@ static int ffm_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat ffm_muxer = {
+AVOutputFormat ff_ffm_muxer = {
     "ffm",
     NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
     "",
diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c
index 66ad953..ab35746 100644
--- a/libavformat/ffmetadec.c
+++ b/libavformat/ffmetadec.c
@@ -163,7 +163,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
     return AVERROR_EOF;
 }
 
-AVInputFormat ffmetadata_demuxer = {
+AVInputFormat ff_ffmetadata_demuxer = {
     .name        = "ffmetadata",
     .long_name   = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
     .read_probe  = probe,
diff --git a/libavformat/ffmetaenc.c b/libavformat/ffmetaenc.c
index 785b537..b20abc9 100644
--- a/libavformat/ffmetaenc.c
+++ b/libavformat/ffmetaenc.c
@@ -89,7 +89,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat ffmetadata_muxer = {
+AVOutputFormat ff_ffmetadata_muxer = {
     .name          = "ffmetadata",
     .long_name     = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
     .extensions    = "ffmeta",
diff --git a/libavformat/file.c b/libavformat/file.c
index 3c3f42f..4f14b9f 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -94,7 +94,7 @@ static int file_close(URLContext *h)
     return close(fd);
 }
 
-URLProtocol file_protocol = {
+URLProtocol ff_file_protocol = {
     "file",
     file_open,
     file_read,
@@ -130,7 +130,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
     return 0;
 }
 
-URLProtocol pipe_protocol = {
+URLProtocol ff_pipe_protocol = {
     "pipe",
     pipe_open,
     file_read,
diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c
index 0442fc3..805ca99 100644
--- a/libavformat/filmstripdec.c
+++ b/libavformat/filmstripdec.c
@@ -98,7 +98,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, in
     return 0;
 }
 
-AVInputFormat filmstrip_demuxer = {
+AVInputFormat ff_filmstrip_demuxer = {
     "filmstrip",
     NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
     sizeof(FilmstripDemuxContext),
diff --git a/libavformat/filmstripenc.c b/libavformat/filmstripenc.c
index 4e10c28..6da575c 100644
--- a/libavformat/filmstripenc.c
+++ b/libavformat/filmstripenc.c
@@ -71,7 +71,7 @@ static int write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat filmstrip_muxer = {
+AVOutputFormat ff_filmstrip_muxer = {
     "filmstrip",
     NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
     NULL,
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index d73486f..f971d09 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -123,7 +123,7 @@ static int flac_probe(AVProbeData *p)
     else                                            return AVPROBE_SCORE_MAX/2;
 }
 
-AVInputFormat flac_demuxer = {
+AVInputFormat ff_flac_demuxer = {
     "flac",
     NULL_IF_CONFIG_SMALL("raw FLAC"),
     0,
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
index 281d013..5eee5be 100644
--- a/libavformat/flacenc.c
+++ b/libavformat/flacenc.c
@@ -118,7 +118,7 @@ static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat flac_muxer = {
+AVOutputFormat ff_flac_muxer = {
     "flac",
     NULL_IF_CONFIG_SMALL("raw FLAC"),
     "audio/x-flac",
diff --git a/libavformat/flic.c b/libavformat/flic.c
index 51320c9..bf93c5c 100644
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -259,7 +259,7 @@ static int flic_read_packet(AVFormatContext *s,
     return ret;
 }
 
-AVInputFormat flic_demuxer = {
+AVInputFormat ff_flic_demuxer = {
     "flic",
     NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
     sizeof(FlicDemuxContext),
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index b359261..e442cac 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -491,7 +491,7 @@ static int flv_read_seek2(AVFormatContext *s, int stream_index,
 }
 #endif
 
-AVInputFormat flv_demuxer = {
+AVInputFormat ff_flv_demuxer = {
     "flv",
     NULL_IF_CONFIG_SMALL("FLV format"),
     sizeof(FLVContext),
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index e138292..b6e406b 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -437,7 +437,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat flv_muxer = {
+AVOutputFormat ff_flv_muxer = {
     "flv",
     NULL_IF_CONFIG_SMALL("FLV format"),
     "video/x-flv",
diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c
index f59a0c8..f456ec6 100644
--- a/libavformat/framecrcenc.c
+++ b/libavformat/framecrcenc.c
@@ -33,7 +33,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat framecrc_muxer = {
+AVOutputFormat ff_framecrc_muxer = {
     "framecrc",
     NULL_IF_CONFIG_SMALL("framecrc testing format"),
     NULL,
diff --git a/libavformat/gif.c b/libavformat/gif.c
index 4741915..2388f9b 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -344,7 +344,7 @@ static int gif_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat gif_muxer = {
+AVOutputFormat ff_gif_muxer = {
     "gif",
     NULL_IF_CONFIG_SMALL("GIF Animation"),
     "image/gif",
diff --git a/libavformat/gopher.c b/libavformat/gopher.c
index b528f9b..767ec22 100644
--- a/libavformat/gopher.c
+++ b/libavformat/gopher.c
@@ -119,7 +119,7 @@ static int gopher_read(URLContext *h, uint8_t *buf, int size)
 }
 
 
-URLProtocol gopher_protocol = {
+URLProtocol ff_gopher_protocol = {
     "gopher",
     gopher_open,
     gopher_read,
diff --git a/libavformat/gxf.c b/libavformat/gxf.c
index d37a1d8..1e08d82 100644
--- a/libavformat/gxf.c
+++ b/libavformat/gxf.c
@@ -515,7 +515,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index,
     return res;
 }
 
-AVInputFormat gxf_demuxer = {
+AVInputFormat ff_gxf_demuxer = {
     "gxf",
     NULL_IF_CONFIG_SMALL("GXF format"),
     0,
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index 565a865..94976a3 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -927,7 +927,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk
                                av_interleave_packet_per_dts, gxf_compare_field_nb);
 }
 
-AVOutputFormat gxf_muxer = {
+AVOutputFormat ff_gxf_muxer = {
     "gxf",
     NULL_IF_CONFIG_SMALL("GXF format"),
     NULL,
diff --git a/libavformat/h261dec.c b/libavformat/h261dec.c
index 13394a1..1478ed6 100644
--- a/libavformat/h261dec.c
+++ b/libavformat/h261dec.c
@@ -62,7 +62,7 @@ static int h261_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat h261_demuxer = {
+AVInputFormat ff_h261_demuxer = {
     "h261",
     NULL_IF_CONFIG_SMALL("raw H.261"),
     0,
diff --git a/libavformat/h263dec.c b/libavformat/h263dec.c
index e27c395..634923d 100644
--- a/libavformat/h263dec.c
+++ b/libavformat/h263dec.c
@@ -64,7 +64,7 @@ static int h263_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat h263_demuxer = {
+AVInputFormat ff_h263_demuxer = {
     "h263",
     NULL_IF_CONFIG_SMALL("raw H.263"),
     0,
diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c
index 10c239d..3f5ed5e 100644
--- a/libavformat/h264dec.c
+++ b/libavformat/h264dec.c
@@ -67,7 +67,7 @@ static int h264_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat h264_demuxer = {
+AVInputFormat ff_h264_demuxer = {
     "h264",
     NULL_IF_CONFIG_SMALL("raw H.264 video format"),
     0,
diff --git a/libavformat/http.c b/libavformat/http.c
index e9fab3b..3d63a6d 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -503,7 +503,7 @@ http_get_file_handle(URLContext *h)
     return url_get_file_handle(s->hd);
 }
 
-URLProtocol http_protocol = {
+URLProtocol ff_http_protocol = {
     "http",
     http_open,
     http_read,
diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index cd4ebf8..e40d725 100644
--- a/libavformat/idcin.c
+++ b/libavformat/idcin.c
@@ -286,7 +286,7 @@ static int idcin_read_packet(AVFormatContext *s,
     return ret;
 }
 
-AVInputFormat idcin_demuxer = {
+AVInputFormat ff_idcin_demuxer = {
     "idcin",
     NULL_IF_CONFIG_SMALL("id Cinematic format"),
     sizeof(IdcinDemuxContext),
diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c
index 6b036d9..285a3e1 100644
--- a/libavformat/idroqdec.c
+++ b/libavformat/idroqdec.c
@@ -216,7 +216,7 @@ static int roq_read_packet(AVFormatContext *s,
     return ret;
 }
 
-AVInputFormat roq_demuxer = {
+AVInputFormat ff_roq_demuxer = {
     "RoQ",
     NULL_IF_CONFIG_SMALL("id RoQ format"),
     sizeof(RoqDemuxContext),
diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c
index fda899a..8859c98 100644
--- a/libavformat/idroqenc.c
+++ b/libavformat/idroqenc.c
@@ -35,7 +35,7 @@ static int roq_write_header(struct AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat roq_muxer =
+AVOutputFormat ff_roq_muxer =
 {
     "RoQ",
     NULL_IF_CONFIG_SMALL("raw id RoQ format"),
diff --git a/libavformat/iff.c b/libavformat/iff.c
index e871956..90a3ea9 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -314,7 +314,7 @@ static int iff_read_packet(AVFormatContext *s,
     return ret;
 }
 
-AVInputFormat iff_demuxer = {
+AVInputFormat ff_iff_demuxer = {
     "IFF",
     NULL_IF_CONFIG_SMALL("IFF format"),
     sizeof(IffDemuxContext),
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 71f1dd0..4cf409e 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -412,7 +412,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
 
 /* input */
 #if CONFIG_IMAGE2_DEMUXER
-AVInputFormat image2_demuxer = {
+AVInputFormat ff_image2_demuxer = {
     .name           = "image2",
     .long_name      = NULL_IF_CONFIG_SMALL("image2 sequence"),
     .priv_data_size = sizeof(VideoData),
@@ -423,7 +423,7 @@ AVInputFormat image2_demuxer = {
 };
 #endif
 #if CONFIG_IMAGE2PIPE_DEMUXER
-AVInputFormat image2pipe_demuxer = {
+AVInputFormat ff_image2pipe_demuxer = {
     .name           = "image2pipe",
     .long_name      = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
     .priv_data_size = sizeof(VideoData),
@@ -434,7 +434,7 @@ AVInputFormat image2pipe_demuxer = {
 
 /* output */
 #if CONFIG_IMAGE2_MUXER
-AVOutputFormat image2_muxer = {
+AVOutputFormat ff_image2_muxer = {
     .name           = "image2",
     .long_name      = NULL_IF_CONFIG_SMALL("image2 sequence"),
     .extensions     = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
@@ -447,7 +447,7 @@ AVOutputFormat image2_muxer = {
 };
 #endif
 #if CONFIG_IMAGE2PIPE_MUXER
-AVOutputFormat image2pipe_muxer = {
+AVOutputFormat ff_image2pipe_muxer = {
     .name           = "image2pipe",
     .long_name      = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
     .priv_data_size = sizeof(VideoData),
diff --git a/libavformat/ingenientdec.c b/libavformat/ingenientdec.c
index 61d39e1..79587b5 100644
--- a/libavformat/ingenientdec.c
+++ b/libavformat/ingenientdec.c
@@ -58,7 +58,7 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat ingenient_demuxer = {
+AVInputFormat ff_ingenient_demuxer = {
     "ingenient",
     NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
     0,
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index 18077b5..6d84402 100644
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -620,7 +620,7 @@ static int ipmovie_read_packet(AVFormatContext *s,
     return ret;
 }
 
-AVInputFormat ipmovie_demuxer = {
+AVInputFormat ff_ipmovie_demuxer = {
     "ipmovie",
     NULL_IF_CONFIG_SMALL("Interplay MVE format"),
     sizeof(IPMVEContext),
diff --git a/libavformat/iss.c b/libavformat/iss.c
index 156af97..c47c8c8 100644
--- a/libavformat/iss.c
+++ b/libavformat/iss.c
@@ -122,7 +122,7 @@ static int iss_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat iss_demuxer = {
+AVInputFormat ff_iss_demuxer = {
     "ISS",
     NULL_IF_CONFIG_SMALL("Funcom ISS format"),
     sizeof(IssDemuxContext),
diff --git a/libavformat/iv8.c b/libavformat/iv8.c
index 00ddcd4..07659cf 100644
--- a/libavformat/iv8.c
+++ b/libavformat/iv8.c
@@ -84,7 +84,7 @@ retry:
     return ret;
 }
 
-AVInputFormat iv8_demuxer = {
+AVInputFormat ff_iv8_demuxer = {
     "iv8",
     NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server"),
     0,
diff --git a/libavformat/ivfdec.c b/libavformat/ivfdec.c
index 9baa3ec..94b8b82 100644
--- a/libavformat/ivfdec.c
+++ b/libavformat/ivfdec.c
@@ -79,7 +79,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat ivf_demuxer = {
+AVInputFormat ff_ivf_demuxer = {
     "ivf",
     NULL_IF_CONFIG_SMALL("On2 IVF"),
     0,
diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c
index c9e1782..b3b2841 100644
--- a/libavformat/ivfenc.c
+++ b/libavformat/ivfenc.c
@@ -58,7 +58,7 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat ivf_muxer = {
+AVOutputFormat ff_ivf_muxer = {
     .name = "ivf",
     .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
     .extensions = "ivf",
diff --git a/libavformat/libnut.c b/libavformat/libnut.c
index 4543df7..5630bf8 100644
--- a/libavformat/libnut.c
+++ b/libavformat/libnut.c
@@ -150,7 +150,7 @@ static int nut_write_trailer(AVFormatContext * avf) {
     return 0;
 }
 
-AVOutputFormat libnut_muxer = {
+AVOutputFormat ff_libnut_muxer = {
     "libnut",
     "nut format",
     "video/x-nut",
@@ -297,7 +297,7 @@ static int nut_read_close(AVFormatContext *s) {
     return 0;
 }
 
-AVInputFormat libnut_demuxer = {
+AVInputFormat ff_libnut_demuxer = {
     "libnut",
     NULL_IF_CONFIG_SMALL("NUT format"),
     sizeof(NUTContext),
diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c
index 344f0f9..632ac95 100644
--- a/libavformat/librtmp.c
+++ b/libavformat/librtmp.c
@@ -157,7 +157,7 @@ static int rtmp_get_file_handle(URLContext *s)
     return RTMP_Socket(r);
 }
 
-URLProtocol rtmp_protocol = {
+URLProtocol ff_rtmp_protocol = {
     "rtmp",
     rtmp_open,
     rtmp_read,
@@ -170,7 +170,7 @@ URLProtocol rtmp_protocol = {
     rtmp_get_file_handle
 };
 
-URLProtocol rtmpt_protocol = {
+URLProtocol ff_rtmpt_protocol = {
     "rtmpt",
     rtmp_open,
     rtmp_read,
@@ -183,7 +183,7 @@ URLProtocol rtmpt_protocol = {
     rtmp_get_file_handle
 };
 
-URLProtocol rtmpe_protocol = {
+URLProtocol ff_rtmpe_protocol = {
     "rtmpe",
     rtmp_open,
     rtmp_read,
@@ -196,7 +196,7 @@ URLProtocol rtmpe_protocol = {
     rtmp_get_file_handle
 };
 
-URLProtocol rtmpte_protocol = {
+URLProtocol ff_rtmpte_protocol = {
     "rtmpte",
     rtmp_open,
     rtmp_read,
@@ -209,7 +209,7 @@ URLProtocol rtmpte_protocol = {
     rtmp_get_file_handle
 };
 
-URLProtocol rtmps_protocol = {
+URLProtocol ff_rtmps_protocol = {
     "rtmps",
     rtmp_open,
     rtmp_read,
diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c
index c1397fb..5cb202e 100644
--- a/libavformat/lmlm4.c
+++ b/libavformat/lmlm4.c
@@ -117,7 +117,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) {
     return ret;
 }
 
-AVInputFormat lmlm4_demuxer = {
+AVInputFormat ff_lmlm4_demuxer = {
     "lmlm4",
     NULL_IF_CONFIG_SMALL("lmlm4 raw format"),
     0,
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 2575f36..1d4d269 100644
--- a/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@ -336,7 +336,7 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat lxf_demuxer = {
+AVInputFormat ff_lxf_demuxer = {
     .name           = "lxf",
     .long_name      = NULL_IF_CONFIG_SMALL("VR native stream format (LXF)"),
     .priv_data_size = sizeof(LXFDemuxContext),
diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c
index fdd3a80..4b0154e 100644
--- a/libavformat/m4vdec.c
+++ b/libavformat/m4vdec.c
@@ -49,7 +49,7 @@ static int mpeg4video_probe(AVProbeData *probe_packet)
     return 0;
 }
 
-AVInputFormat m4v_demuxer = {
+AVInputFormat ff_m4v_demuxer = {
     "m4v",
     NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
     0,
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 820140f..1a87f4a 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1920,7 +1920,7 @@ static int matroska_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat matroska_demuxer = {
+AVInputFormat ff_matroska_demuxer = {
     "matroska,webm",
     NULL_IF_CONFIG_SMALL("Matroska/WebM file format"),
     sizeof(MatroskaDemuxContext),
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index dc08c18..a288c7f 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1177,7 +1177,7 @@ static int mkv_write_trailer(AVFormatContext *s)
 }
 
 #if CONFIG_MATROSKA_MUXER
-AVOutputFormat matroska_muxer = {
+AVOutputFormat ff_matroska_muxer = {
     "matroska",
     NULL_IF_CONFIG_SMALL("Matroska file format"),
     "video/x-matroska",
@@ -1195,7 +1195,7 @@ AVOutputFormat matroska_muxer = {
 #endif
 
 #if CONFIG_WEBM_MUXER
-AVOutputFormat webm_muxer = {
+AVOutputFormat ff_webm_muxer = {
     "webm",
     NULL_IF_CONFIG_SMALL("WebM file format"),
     "video/webm",
@@ -1211,7 +1211,7 @@ AVOutputFormat webm_muxer = {
 #endif
 
 #if CONFIG_MATROSKA_AUDIO_MUXER
-AVOutputFormat matroska_audio_muxer = {
+AVOutputFormat ff_matroska_audio_muxer = {
     "matroska",
     NULL_IF_CONFIG_SMALL("Matroska file format"),
     "audio/x-matroska",
diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c
index f9ab3d0..dd2f7c0 100644
--- a/libavformat/md5enc.c
+++ b/libavformat/md5enc.c
@@ -65,7 +65,7 @@ static int write_trailer(struct AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat md5_muxer = {
+AVOutputFormat ff_md5_muxer = {
     "md5",
     NULL_IF_CONFIG_SMALL("MD5 testing format"),
     NULL,
@@ -95,7 +95,7 @@ static int framemd5_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat framemd5_muxer = {
+AVOutputFormat ff_framemd5_muxer = {
     "framemd5",
     NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"),
     NULL,
diff --git a/libavformat/md5proto.c b/libavformat/md5proto.c
index 63e9fe4..c391dff 100644
--- a/libavformat/md5proto.c
+++ b/libavformat/md5proto.c
@@ -82,7 +82,7 @@ static int md5_get_handle(URLContext *h)
     return (intptr_t)h->priv_data;
 }
 
-URLProtocol md5_protocol = {
+URLProtocol ff_md5_protocol = {
     .name                = "md5",
     .url_open            = md5_open,
     .url_write           = md5_write,
diff --git a/libavformat/mm.c b/libavformat/mm.c
index cb0917a..475930f 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -188,7 +188,7 @@ static int read_packet(AVFormatContext *s,
     return 0;
 }
 
-AVInputFormat mm_demuxer = {
+AVInputFormat ff_mm_demuxer = {
     "mm",
     NULL_IF_CONFIG_SMALL("American Laser Games MM format"),
     sizeof(MmDemuxContext),
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 85b23a3..2b2af4d 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -291,7 +291,7 @@ static int mmf_read_packet(AVFormatContext *s,
 }
 
 #if CONFIG_MMF_DEMUXER
-AVInputFormat mmf_demuxer = {
+AVInputFormat ff_mmf_demuxer = {
     "mmf",
     NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
     sizeof(MMFContext),
@@ -303,7 +303,7 @@ AVInputFormat mmf_demuxer = {
 };
 #endif
 #if CONFIG_MMF_MUXER
-AVOutputFormat mmf_muxer = {
+AVOutputFormat ff_mmf_muxer = {
     "mmf",
     NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
     "application/vnd.smaf",
diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c
index 3581431..b0acd10 100644
--- a/libavformat/mmsh.c
+++ b/libavformat/mmsh.c
@@ -359,7 +359,7 @@ static int mmsh_read(URLContext *h, uint8_t *buf, int size)
     return res;
 }
 
-URLProtocol mmsh_protocol = {
+URLProtocol ff_mmsh_protocol = {
     .name      = "mmsh",
     .url_open  = mmsh_open,
     .url_read  = mmsh_read,
diff --git a/libavformat/mmst.c b/libavformat/mmst.c
index 08e3b3e..d3417d1 100644
--- a/libavformat/mmst.c
+++ b/libavformat/mmst.c
@@ -621,7 +621,7 @@ static int mms_read(URLContext *h, uint8_t *buf, int size)
     return result;
 }
 
-URLProtocol mmst_protocol = {
+URLProtocol ff_mmst_protocol = {
     "mmst",
     mms_open,
     mms_read,
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 40666c1..a64ca1d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2556,7 +2556,7 @@ static int mov_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat mov_demuxer = {
+AVInputFormat ff_mov_demuxer = {
     "mov,mp4,m4a,3gp,3g2,mj2",
     NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"),
     sizeof(MOVContext),
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5230938..5886dfe 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2205,7 +2205,7 @@ static int mov_write_trailer(AVFormatContext *s)
 }
 
 #if CONFIG_MOV_MUXER
-AVOutputFormat mov_muxer = {
+AVOutputFormat ff_mov_muxer = {
     "mov",
     NULL_IF_CONFIG_SMALL("MOV format"),
     NULL,
@@ -2221,7 +2221,7 @@ AVOutputFormat mov_muxer = {
 };
 #endif
 #if CONFIG_TGP_MUXER
-AVOutputFormat tgp_muxer = {
+AVOutputFormat ff_tgp_muxer = {
     "3gp",
     NULL_IF_CONFIG_SMALL("3GP format"),
     NULL,
@@ -2237,7 +2237,7 @@ AVOutputFormat tgp_muxer = {
 };
 #endif
 #if CONFIG_MP4_MUXER
-AVOutputFormat mp4_muxer = {
+AVOutputFormat ff_mp4_muxer = {
     "mp4",
     NULL_IF_CONFIG_SMALL("MP4 format"),
     "application/mp4",
@@ -2253,7 +2253,7 @@ AVOutputFormat mp4_muxer = {
 };
 #endif
 #if CONFIG_PSP_MUXER
-AVOutputFormat psp_muxer = {
+AVOutputFormat ff_psp_muxer = {
     "psp",
     NULL_IF_CONFIG_SMALL("PSP MP4 format"),
     NULL,
@@ -2269,7 +2269,7 @@ AVOutputFormat psp_muxer = {
 };
 #endif
 #if CONFIG_TG2_MUXER
-AVOutputFormat tg2_muxer = {
+AVOutputFormat ff_tg2_muxer = {
     "3g2",
     NULL_IF_CONFIG_SMALL("3GP2 format"),
     NULL,
@@ -2285,7 +2285,7 @@ AVOutputFormat tg2_muxer = {
 };
 #endif
 #if CONFIG_IPOD_MUXER
-AVOutputFormat ipod_muxer = {
+AVOutputFormat ff_ipod_muxer = {
     "ipod",
     NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"),
     "application/mp4",
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index c06969b..5bc4ce6 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -185,7 +185,7 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat mp3_demuxer = {
+AVInputFormat ff_mp3_demuxer = {
     "mp3",
     NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"),
     0,
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index 139f2d4..b2c0a7e 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -134,7 +134,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)
 }
 
 #if CONFIG_MP2_MUXER
-AVOutputFormat mp2_muxer = {
+AVOutputFormat ff_mp2_muxer = {
     "mp2",
     NULL_IF_CONFIG_SMALL("MPEG audio layer 2"),
     "audio/x-mpeg",
@@ -233,7 +233,7 @@ static int mp3_write_header(struct AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat mp3_muxer = {
+AVOutputFormat ff_mp3_muxer = {
     "mp3",
     NULL_IF_CONFIG_SMALL("MPEG audio layer 3"),
     "audio/x-mpeg",
diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index ecc9809..aa05726 100644
--- a/libavformat/mpc.c
+++ b/libavformat/mpc.c
@@ -212,7 +212,7 @@ static int mpc_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
 }
 
 
-AVInputFormat mpc_demuxer = {
+AVInputFormat ff_mpc_demuxer = {
     "mpc",
     NULL_IF_CONFIG_SMALL("Musepack"),
     sizeof(MPCContext),
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index 92e996c..1117300 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -279,7 +279,7 @@ static int mpc8_read_seek(AVFormatContext *s, int stream_index, int64_t timestam
 }
 
 
-AVInputFormat mpc8_demuxer = {
+AVInputFormat ff_mpc8_demuxer = {
     "mpc8",
     NULL_IF_CONFIG_SMALL("Musepack SV8"),
     sizeof(MPCContext),
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 6fd0125..135482b 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -610,7 +610,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
     return dts;
 }
 
-AVInputFormat mpegps_demuxer = {
+AVInputFormat ff_mpegps_demuxer = {
     "mpeg",
     NULL_IF_CONFIG_SMALL("MPEG-PS format"),
     sizeof(MpegDemuxContext),
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 5c090f6..eef385f 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -76,10 +76,10 @@ typedef struct {
 
 } MpegMuxContext;
 
-extern AVOutputFormat mpeg1vcd_muxer;
-extern AVOutputFormat mpeg2dvd_muxer;
-extern AVOutputFormat mpeg2svcd_muxer;
-extern AVOutputFormat mpeg2vob_muxer;
+extern AVOutputFormat ff_mpeg1vcd_muxer;
+extern AVOutputFormat ff_mpeg2dvd_muxer;
+extern AVOutputFormat ff_mpeg2svcd_muxer;
+extern AVOutputFormat ff_mpeg2vob_muxer;
 
 static int put_pack_header(AVFormatContext *ctx,
                            uint8_t *buf, int64_t timestamp)
@@ -297,12 +297,12 @@ static int mpeg_mux_init(AVFormatContext *ctx)
     int video_bitrate;
 
     s->packet_number = 0;
-    s->is_vcd =    (CONFIG_MPEG1VCD_MUXER  && ctx->oformat == &mpeg1vcd_muxer);
-    s->is_svcd =   (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer);
-    s->is_mpeg2 = ((CONFIG_MPEG2VOB_MUXER  && ctx->oformat == &mpeg2vob_muxer) ||
-                   (CONFIG_MPEG2DVD_MUXER  && ctx->oformat == &mpeg2dvd_muxer) ||
-                   (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer));
-    s->is_dvd =    (CONFIG_MPEG2DVD_MUXER  && ctx->oformat == &mpeg2dvd_muxer);
+    s->is_vcd =    (CONFIG_MPEG1VCD_MUXER  && ctx->oformat == &ff_mpeg1vcd_muxer);
+    s->is_svcd =   (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &ff_mpeg2svcd_muxer);
+    s->is_mpeg2 = ((CONFIG_MPEG2VOB_MUXER  && ctx->oformat == &ff_mpeg2vob_muxer) ||
+                   (CONFIG_MPEG2DVD_MUXER  && ctx->oformat == &ff_mpeg2dvd_muxer) ||
+                   (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &ff_mpeg2svcd_muxer));
+    s->is_dvd =    (CONFIG_MPEG2DVD_MUXER  && ctx->oformat == &ff_mpeg2dvd_muxer);
 
     if(ctx->packet_size) {
         if (ctx->packet_size < 20 || ctx->packet_size > (1 << 23) + 10) {
@@ -1233,7 +1233,7 @@ static int mpeg_mux_end(AVFormatContext *ctx)
 }
 
 #if CONFIG_MPEG1SYSTEM_MUXER
-AVOutputFormat mpeg1system_muxer = {
+AVOutputFormat ff_mpeg1system_muxer = {
     "mpeg",
     NULL_IF_CONFIG_SMALL("MPEG-1 System format"),
     "video/mpeg",
@@ -1247,7 +1247,7 @@ AVOutputFormat mpeg1system_muxer = {
 };
 #endif
 #if CONFIG_MPEG1VCD_MUXER
-AVOutputFormat mpeg1vcd_muxer = {
+AVOutputFormat ff_mpeg1vcd_muxer = {
     "vcd",
     NULL_IF_CONFIG_SMALL("MPEG-1 System format (VCD)"),
     "video/mpeg",
@@ -1261,7 +1261,7 @@ AVOutputFormat mpeg1vcd_muxer = {
 };
 #endif
 #if CONFIG_MPEG2VOB_MUXER
-AVOutputFormat mpeg2vob_muxer = {
+AVOutputFormat ff_mpeg2vob_muxer = {
     "vob",
     NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),
     "video/mpeg",
@@ -1277,7 +1277,7 @@ AVOutputFormat mpeg2vob_muxer = {
 
 /* Same as mpeg2vob_mux except that the pack size is 2324 */
 #if CONFIG_MPEG2SVCD_MUXER
-AVOutputFormat mpeg2svcd_muxer = {
+AVOutputFormat ff_mpeg2svcd_muxer = {
     "svcd",
     NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),
     "video/mpeg",
@@ -1293,7 +1293,7 @@ AVOutputFormat mpeg2svcd_muxer = {
 
 /*  Same as mpeg2vob_mux except the 'is_dvd' flag is set to produce NAV pkts */
 #if CONFIG_MPEG2DVD_MUXER
-AVOutputFormat mpeg2dvd_muxer = {
+AVOutputFormat ff_mpeg2dvd_muxer = {
     "dvd",
     NULL_IF_CONFIG_SMALL("MPEG-2 PS format (DVD VOB)"),
     "video/mpeg",
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 959be31..e8f31d6 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -158,7 +158,7 @@ typedef struct PESContext {
     uint8_t *buffer;
 } PESContext;
 
-extern AVInputFormat mpegts_demuxer;
+extern AVInputFormat ff_mpegts_demuxer;
 
 static void clear_program(MpegTSContext *ts, unsigned int programid)
 {
@@ -1468,7 +1468,7 @@ static int mpegts_read_header(AVFormatContext *s,
     ts->stream = s;
     ts->auto_guess = 0;
 
-    if (s->iformat == &mpegts_demuxer) {
+    if (s->iformat == &ff_mpegts_demuxer) {
         /* normal demux */
 
         /* first do a scaning to get all the services */
@@ -1845,7 +1845,7 @@ void ff_mpegts_parse_close(MpegTSContext *ts)
     av_free(ts);
 }
 
-AVInputFormat mpegts_demuxer = {
+AVInputFormat ff_mpegts_demuxer = {
     "mpegts",
     NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
     sizeof(MpegTSContext),
@@ -1861,7 +1861,7 @@ AVInputFormat mpegts_demuxer = {
 #endif
 };
 
-AVInputFormat mpegtsraw_demuxer = {
+AVInputFormat ff_mpegtsraw_demuxer = {
     "mpegtsraw",
     NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"),
     sizeof(MpegTSContext),
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index f621646..66dc58a 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -948,7 +948,7 @@ static int mpegts_write_end(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat mpegts_muxer = {
+AVOutputFormat ff_mpegts_muxer = {
     "mpegts",
     NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
     "video/x-mpegts",
diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c
index d0b9a2c..d1ba1f8 100644
--- a/libavformat/mpegvideodec.c
+++ b/libavformat/mpegvideodec.c
@@ -55,7 +55,7 @@ static int mpegvideo_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat mpegvideo_demuxer = {
+AVInputFormat ff_mpegvideo_demuxer = {
     "mpegvideo",
     NULL_IF_CONFIG_SMALL("raw MPEG video"),
     0,
diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c
index 8973877..76f5985 100644
--- a/libavformat/mpjpeg.c
+++ b/libavformat/mpjpeg.c
@@ -53,7 +53,7 @@ static int mpjpeg_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat mpjpeg_muxer = {
+AVOutputFormat ff_mpjpeg_muxer = {
     "mpjpeg",
     NULL_IF_CONFIG_SMALL("MIME multipart JPEG format"),
     "multipart/x-mixed-replace;boundary=" BOUNDARY_TAG,
diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c
index e548871..f9cde02 100644
--- a/libavformat/msnwc_tcp.c
+++ b/libavformat/msnwc_tcp.c
@@ -130,7 +130,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
     return HEADER_SIZE + size;
 }
 
-AVInputFormat msnwc_tcp_demuxer = {
+AVInputFormat ff_msnwc_tcp_demuxer = {
     "msnwctcp",
     NULL_IF_CONFIG_SMALL("MSN TCP Webcam stream"),
     0,
diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 9280455..acb21a9 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -196,7 +196,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat mtv_demuxer = {
+AVInputFormat ff_mtv_demuxer = {
     "MTV",
     NULL_IF_CONFIG_SMALL("MTV format"),
     sizeof(MTVDemuxContext),
diff --git a/libavformat/mvi.c b/libavformat/mvi.c
index 506976d..c982e6b 100644
--- a/libavformat/mvi.c
+++ b/libavformat/mvi.c
@@ -123,7 +123,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat mvi_demuxer = {
+AVInputFormat ff_mvi_demuxer = {
     "mvi",
     NULL_IF_CONFIG_SMALL("Motion Pixels MVI format"),
     sizeof(MviDemuxContext),
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index ac5ea4b..5276c8b 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1014,7 +1014,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
     return 0;
 }
 
-AVInputFormat mxf_demuxer = {
+AVInputFormat ff_mxf_demuxer = {
     "mxf",
     NULL_IF_CONFIG_SMALL("Material eXchange Format"),
     sizeof(MXFContext),
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index c53849a..8a8d7dd 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -44,7 +44,7 @@
 static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 };
 static const int PAL_samples_per_frame[]  = { 1920, 0 };
 
-extern AVOutputFormat mxf_d10_muxer;
+extern AVOutputFormat ff_mxf_d10_muxer;
 
 #define EDIT_UNITS_PER_BODY 250
 #define KAG_SIZE 512
@@ -1371,7 +1371,7 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st,
             }
         }
     }
-    if (s->oformat != &mxf_d10_muxer)
+    if (s->oformat != &ff_mxf_d10_muxer)
         sc->codec_ul = mxf_get_mpeg2_codec_ul(st->codec);
     return !!sc->codec_ul;
 }
@@ -1436,7 +1436,7 @@ static int mxf_write_header(AVFormatContext *s)
                 return -1;
             }
             av_set_pts_info(st, 64, mxf->time_base.num, mxf->time_base.den);
-            if (s->oformat == &mxf_d10_muxer) {
+            if (s->oformat == &ff_mxf_d10_muxer) {
                 if (st->codec->bit_rate == 50000000)
                     if (mxf->time_base.den == 25) sc->index = 3;
                     else                          sc->index = 5;
@@ -1464,7 +1464,7 @@ static int mxf_write_header(AVFormatContext *s)
                 return -1;
             }
             av_set_pts_info(st, 64, 1, st->codec->sample_rate);
-            if (s->oformat == &mxf_d10_muxer) {
+            if (s->oformat == &ff_mxf_d10_muxer) {
                 if (st->index != 1) {
                     av_log(s, AV_LOG_ERROR, "MXF D-10 only support one audio track\n");
                     return -1;
@@ -1498,7 +1498,7 @@ static int mxf_write_header(AVFormatContext *s)
         present[sc->index]++;
     }
 
-    if (s->oformat == &mxf_d10_muxer) {
+    if (s->oformat == &ff_mxf_d10_muxer) {
         mxf->essence_container_count = 1;
     }
 
@@ -1720,7 +1720,7 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt)
 
     mxf_write_klv_fill(s);
     put_buffer(pb, sc->track_essence_element_key, 16); // write key
-    if (s->oformat == &mxf_d10_muxer) {
+    if (s->oformat == &ff_mxf_d10_muxer) {
         if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
             mxf_write_d10_video_packet(s, st, pkt);
         else
@@ -1879,7 +1879,7 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int
                                mxf_interleave_get_packet, mxf_compare_timestamps);
 }
 
-AVOutputFormat mxf_muxer = {
+AVOutputFormat ff_mxf_muxer = {
     "mxf",
     NULL_IF_CONFIG_SMALL("Material eXchange Format"),
     "application/mxf",
@@ -1895,7 +1895,7 @@ AVOutputFormat mxf_muxer = {
     mxf_interleave,
 };
 
-AVOutputFormat mxf_d10_muxer = {
+AVOutputFormat ff_mxf_d10_muxer = {
     "mxf_d10",
     NULL_IF_CONFIG_SMALL("Material eXchange Format, D-10 Mapping"),
     "application/mxf",
diff --git a/libavformat/mxg.c b/libavformat/mxg.c
index e7791e8..9be97d0 100644
--- a/libavformat/mxg.c
+++ b/libavformat/mxg.c
@@ -240,7 +240,7 @@ static int mxg_close(struct AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat mxg_demuxer = {
+AVInputFormat ff_mxg_demuxer = {
     .name = "mxg",
     .long_name = NULL_IF_CONFIG_SMALL("MxPEG clip file format"),
     .priv_data_size = sizeof(MXGContext),
diff --git a/libavformat/ncdec.c b/libavformat/ncdec.c
index 6d99a04..1472d15 100644
--- a/libavformat/ncdec.c
+++ b/libavformat/ncdec.c
@@ -90,7 +90,7 @@ static int nc_read_packet(AVFormatContext *s, AVPacket *pkt)
     return size;
 }
 
-AVInputFormat nc_demuxer = {
+AVInputFormat ff_nc_demuxer = {
     "nc",
     NULL_IF_CONFIG_SMALL("NC camera feed format"),
     0,
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 44e5097..e15d6e2 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -774,7 +774,7 @@ static int nsv_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat nsv_demuxer = {
+AVInputFormat ff_nsv_demuxer = {
     "nsv",
     NULL_IF_CONFIG_SMALL("Nullsoft Streaming Video"),
     sizeof(NSVContext),
diff --git a/libavformat/nullenc.c b/libavformat/nullenc.c
index 0785b77..1a7d42e 100644
--- a/libavformat/nullenc.c
+++ b/libavformat/nullenc.c
@@ -26,7 +26,7 @@ static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat null_muxer = {
+AVOutputFormat ff_null_muxer = {
     "null",
     NULL_IF_CONFIG_SMALL("raw null video format"),
     NULL,
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index bf72555..a574108 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -926,7 +926,7 @@ static int nut_read_close(AVFormatContext *s)
 }
 
 #if CONFIG_NUT_DEMUXER
-AVInputFormat nut_demuxer = {
+AVInputFormat ff_nut_demuxer = {
     "nut",
     NULL_IF_CONFIG_SMALL("NUT format"),
     sizeof(NUTContext),
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index a030fee..288e4bd 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -793,7 +793,7 @@ static int write_trailer(AVFormatContext *s){
     return 0;
 }
 
-AVOutputFormat nut_muxer = {
+AVOutputFormat ff_nut_muxer = {
     "nut",
     NULL_IF_CONFIG_SMALL("NUT format"),
     "video/x-nut",
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index f0eacd5..58a00df 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -257,7 +257,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
     return AVERROR(EIO);
 }
 
-AVInputFormat nuv_demuxer = {
+AVInputFormat ff_nuv_demuxer = {
     "nuv",
     NULL_IF_CONFIG_SMALL("NuppelVideo format"),
     sizeof(NUVContext),
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 4fcf8ad..1b4553c 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -648,7 +648,7 @@ static int ogg_probe(AVProbeData *p)
         return 0;
 }
 
-AVInputFormat ogg_demuxer = {
+AVInputFormat ff_ogg_demuxer = {
     "ogg",
     NULL_IF_CONFIG_SMALL("Ogg"),
     sizeof (struct ogg),
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index b72efc8..4c2a9d6 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -502,7 +502,7 @@ static int ogg_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat ogg_muxer = {
+AVOutputFormat ff_ogg_muxer = {
     "ogg",
     NULL_IF_CONFIG_SMALL("Ogg"),
     "application/ogg",
diff --git a/libavformat/oma.c b/libavformat/oma.c
index 0f471dd..158ed11 100644
--- a/libavformat/oma.c
+++ b/libavformat/oma.c
@@ -189,7 +189,7 @@ static int oma_read_probe(AVProbeData *p)
 }
 
 
-AVInputFormat oma_demuxer = {
+AVInputFormat ff_oma_demuxer = {
     "oma",
     NULL_IF_CONFIG_SMALL("Sony OpenMG audio"),
     0,
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index 26be4f4..6441d89 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -47,7 +47,7 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
 }
 
 #define PCMDEF(name, long_name, ext, codec) \
-AVInputFormat pcm_ ## name ## _demuxer = {\
+AVInputFormat ff_pcm_ ## name ## _demuxer = {\
     #name,\
     NULL_IF_CONFIG_SMALL(long_name),\
     0,\
diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c
index bda94c3..385425c 100644
--- a/libavformat/pcmenc.c
+++ b/libavformat/pcmenc.c
@@ -23,7 +23,7 @@
 #include "rawenc.h"
 
 #define PCMDEF(name, long_name, ext, codec) \
-AVOutputFormat pcm_ ## name ## _muxer = {\
+AVOutputFormat ff_pcm_ ## name ## _muxer = {\
     #name,\
     NULL_IF_CONFIG_SMALL(long_name),\
     NULL,\
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index 347c26e..4b3d0f3 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -258,7 +258,7 @@ static int str_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat str_demuxer = {
+AVInputFormat ff_str_demuxer = {
     "psxstr",
     NULL_IF_CONFIG_SMALL("Sony Playstation STR format"),
     sizeof(StrDemuxContext),
diff --git a/libavformat/pva.c b/libavformat/pva.c
index abbc6f1..544fc7d 100644
--- a/libavformat/pva.c
+++ b/libavformat/pva.c
@@ -200,7 +200,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index,
     return res;
 }
 
-AVInputFormat pva_demuxer = {
+AVInputFormat ff_pva_demuxer = {
     "pva",
     NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"),
     sizeof(PVAContext),
diff --git a/libavformat/qcp.c b/libavformat/qcp.c
index 676e9c7..7bc32b9 100644
--- a/libavformat/qcp.c
+++ b/libavformat/qcp.c
@@ -187,7 +187,7 @@ static int qcp_read_packet(AVFormatContext *s, AVPacket *pkt)
     return AVERROR_EOF;
 }
 
-AVInputFormat qcp_demuxer = {
+AVInputFormat ff_qcp_demuxer = {
     .name           = "qcp",
     .long_name      = NULL_IF_CONFIG_SMALL("QCP format"),
     .priv_data_size = sizeof(QCPContext),
diff --git a/libavformat/r3d.c b/libavformat/r3d.c
index 556a32b..62c64e0 100644
--- a/libavformat/r3d.c
+++ b/libavformat/r3d.c
@@ -377,7 +377,7 @@ static int r3d_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat r3d_demuxer = {
+AVInputFormat ff_r3d_demuxer = {
     "r3d",
     NULL_IF_CONFIG_SMALL("REDCODE R3D format"),
     sizeof(R3DContext),
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index fe25014..4f830e3 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -138,7 +138,7 @@ int ff_raw_video_read_header(AVFormatContext *s,
 /* Note: Do not forget to add new entries to the Makefile as well. */
 
 #if CONFIG_G722_DEMUXER
-AVInputFormat g722_demuxer = {
+AVInputFormat ff_g722_demuxer = {
     "g722",
     NULL_IF_CONFIG_SMALL("raw G.722"),
     0,
@@ -152,7 +152,7 @@ AVInputFormat g722_demuxer = {
 #endif
 
 #if CONFIG_GSM_DEMUXER
-AVInputFormat gsm_demuxer = {
+AVInputFormat ff_gsm_demuxer = {
     "gsm",
     NULL_IF_CONFIG_SMALL("raw GSM"),
     0,
@@ -166,7 +166,7 @@ AVInputFormat gsm_demuxer = {
 #endif
 
 #if CONFIG_MJPEG_DEMUXER
-AVInputFormat mjpeg_demuxer = {
+AVInputFormat ff_mjpeg_demuxer = {
     "mjpeg",
     NULL_IF_CONFIG_SMALL("raw MJPEG video"),
     0,
@@ -180,7 +180,7 @@ AVInputFormat mjpeg_demuxer = {
 #endif
 
 #if CONFIG_MLP_DEMUXER
-AVInputFormat mlp_demuxer = {
+AVInputFormat ff_mlp_demuxer = {
     "mlp",
     NULL_IF_CONFIG_SMALL("raw MLP"),
     0,
@@ -194,7 +194,7 @@ AVInputFormat mlp_demuxer = {
 #endif
 
 #if CONFIG_TRUEHD_DEMUXER
-AVInputFormat truehd_demuxer = {
+AVInputFormat ff_truehd_demuxer = {
     "truehd",
     NULL_IF_CONFIG_SMALL("raw TrueHD"),
     0,
@@ -208,7 +208,7 @@ AVInputFormat truehd_demuxer = {
 #endif
 
 #if CONFIG_SHORTEN_DEMUXER
-AVInputFormat shorten_demuxer = {
+AVInputFormat ff_shorten_demuxer = {
     "shn",
     NULL_IF_CONFIG_SMALL("raw Shorten"),
     0,
@@ -222,7 +222,7 @@ AVInputFormat shorten_demuxer = {
 #endif
 
 #if CONFIG_VC1_DEMUXER
-AVInputFormat vc1_demuxer = {
+AVInputFormat ff_vc1_demuxer = {
     "vc1",
     NULL_IF_CONFIG_SMALL("raw VC-1"),
     0,
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 5a116b1..6f9fdce 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -33,7 +33,7 @@ int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt)
 /* Note: Do not forget to add new entries to the Makefile as well. */
 
 #if CONFIG_AC3_MUXER
-AVOutputFormat ac3_muxer = {
+AVOutputFormat ff_ac3_muxer = {
     "ac3",
     NULL_IF_CONFIG_SMALL("raw AC-3"),
     "audio/x-ac3",
@@ -48,7 +48,7 @@ AVOutputFormat ac3_muxer = {
 #endif
 
 #if CONFIG_DIRAC_MUXER
-AVOutputFormat dirac_muxer = {
+AVOutputFormat ff_dirac_muxer = {
     "dirac",
     NULL_IF_CONFIG_SMALL("raw Dirac"),
     NULL,
@@ -63,7 +63,7 @@ AVOutputFormat dirac_muxer = {
 #endif
 
 #if CONFIG_DNXHD_MUXER
-AVOutputFormat dnxhd_muxer = {
+AVOutputFormat ff_dnxhd_muxer = {
     "dnxhd",
     NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
     NULL,
@@ -78,7 +78,7 @@ AVOutputFormat dnxhd_muxer = {
 #endif
 
 #if CONFIG_DTS_MUXER
-AVOutputFormat dts_muxer = {
+AVOutputFormat ff_dts_muxer = {
     "dts",
     NULL_IF_CONFIG_SMALL("raw DTS"),
     "audio/x-dca",
@@ -93,7 +93,7 @@ AVOutputFormat dts_muxer = {
 #endif
 
 #if CONFIG_EAC3_MUXER
-AVOutputFormat eac3_muxer = {
+AVOutputFormat ff_eac3_muxer = {
     "eac3",
     NULL_IF_CONFIG_SMALL("raw E-AC-3"),
     "audio/x-eac3",
@@ -108,7 +108,7 @@ AVOutputFormat eac3_muxer = {
 #endif
 
 #if CONFIG_G722_MUXER
-AVOutputFormat g722_muxer = {
+AVOutputFormat ff_g722_muxer = {
     "g722",
     NULL_IF_CONFIG_SMALL("raw G.722"),
     "audio/G722",
@@ -123,7 +123,7 @@ AVOutputFormat g722_muxer = {
 #endif
 
 #if CONFIG_H261_MUXER
-AVOutputFormat h261_muxer = {
+AVOutputFormat ff_h261_muxer = {
     "h261",
     NULL_IF_CONFIG_SMALL("raw H.261"),
     "video/x-h261",
@@ -138,7 +138,7 @@ AVOutputFormat h261_muxer = {
 #endif
 
 #if CONFIG_H263_MUXER
-AVOutputFormat h263_muxer = {
+AVOutputFormat ff_h263_muxer = {
     "h263",
     NULL_IF_CONFIG_SMALL("raw H.263"),
     "video/x-h263",
@@ -153,7 +153,7 @@ AVOutputFormat h263_muxer = {
 #endif
 
 #if CONFIG_H264_MUXER
-AVOutputFormat h264_muxer = {
+AVOutputFormat ff_h264_muxer = {
     "h264",
     NULL_IF_CONFIG_SMALL("raw H.264 video format"),
     NULL,
@@ -168,7 +168,7 @@ AVOutputFormat h264_muxer = {
 #endif
 
 #if CONFIG_CAVSVIDEO_MUXER
-AVOutputFormat cavsvideo_muxer = {
+AVOutputFormat ff_cavsvideo_muxer = {
     "cavsvideo",
     NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
     NULL,
@@ -183,7 +183,7 @@ AVOutputFormat cavsvideo_muxer = {
 #endif
 
 #if CONFIG_M4V_MUXER
-AVOutputFormat m4v_muxer = {
+AVOutputFormat ff_m4v_muxer = {
     "m4v",
     NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
     NULL,
@@ -198,7 +198,7 @@ AVOutputFormat m4v_muxer = {
 #endif
 
 #if CONFIG_MJPEG_MUXER
-AVOutputFormat mjpeg_muxer = {
+AVOutputFormat ff_mjpeg_muxer = {
     "mjpeg",
     NULL_IF_CONFIG_SMALL("raw MJPEG video"),
     "video/x-mjpeg",
@@ -213,7 +213,7 @@ AVOutputFormat mjpeg_muxer = {
 #endif
 
 #if CONFIG_MLP_MUXER
-AVOutputFormat mlp_muxer = {
+AVOutputFormat ff_mlp_muxer = {
     "mlp",
     NULL_IF_CONFIG_SMALL("raw MLP"),
     NULL,
@@ -228,7 +228,7 @@ AVOutputFormat mlp_muxer = {
 #endif
 
 #if CONFIG_SRT_MUXER
-AVOutputFormat srt_muxer = {
+AVOutputFormat ff_srt_muxer = {
     .name           = "srt",
     .long_name      = NULL_IF_CONFIG_SMALL("SubRip subtitle format"),
     .mime_type      = "application/x-subrip",
@@ -240,7 +240,7 @@ AVOutputFormat srt_muxer = {
 #endif
 
 #if CONFIG_TRUEHD_MUXER
-AVOutputFormat truehd_muxer = {
+AVOutputFormat ff_truehd_muxer = {
     "truehd",
     NULL_IF_CONFIG_SMALL("raw TrueHD"),
     NULL,
@@ -255,7 +255,7 @@ AVOutputFormat truehd_muxer = {
 #endif
 
 #if CONFIG_MPEG1VIDEO_MUXER
-AVOutputFormat mpeg1video_muxer = {
+AVOutputFormat ff_mpeg1video_muxer = {
     "mpeg1video",
     NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
     "video/x-mpeg",
@@ -270,7 +270,7 @@ AVOutputFormat mpeg1video_muxer = {
 #endif
 
 #if CONFIG_MPEG2VIDEO_MUXER
-AVOutputFormat mpeg2video_muxer = {
+AVOutputFormat ff_mpeg2video_muxer = {
     "mpeg2video",
     NULL_IF_CONFIG_SMALL("raw MPEG-2 video"),
     NULL,
@@ -285,7 +285,7 @@ AVOutputFormat mpeg2video_muxer = {
 #endif
 
 #if CONFIG_RAWVIDEO_MUXER
-AVOutputFormat rawvideo_muxer = {
+AVOutputFormat ff_rawvideo_muxer = {
     "rawvideo",
     NULL_IF_CONFIG_SMALL("raw video format"),
     NULL,
diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c
index da61300..127119f 100644
--- a/libavformat/rawvideodec.c
+++ b/libavformat/rawvideodec.c
@@ -44,7 +44,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat rawvideo_demuxer = {
+AVInputFormat ff_rawvideo_demuxer = {
     "rawvideo",
     NULL_IF_CONFIG_SMALL("raw video format"),
     0,
diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index 303a2a8..3428b4d 100644
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -528,7 +528,7 @@ rdt_new_context (void)
 {
     PayloadContext *rdt = av_mallocz(sizeof(PayloadContext));
 
-    av_open_input_stream(&rdt->rmctx, NULL, "", &rdt_demuxer, NULL);
+    av_open_input_stream(&rdt->rmctx, NULL, "", &ff_rdt_demuxer, NULL);
 
     return rdt;
 }
diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index bfffef3..ed1fb23 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -287,7 +287,7 @@ static int rl2_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
     return 0;
 }
 
-AVInputFormat rl2_demuxer = {
+AVInputFormat ff_rl2_demuxer = {
     "rl2",
     NULL_IF_CONFIG_SMALL("RL2 format"),
     sizeof(Rl2DemuxContext),
diff --git a/libavformat/rm.h b/libavformat/rm.h
index 182fddf..2d4656a 100644
--- a/libavformat/rm.h
+++ b/libavformat/rm.h
@@ -35,7 +35,7 @@ RMStream *ff_rm_alloc_rmstream (void);
 void      ff_rm_free_rmstream  (RMStream *rms);
 
 /*< input format for Realmedia-style RTSP streams */
-extern AVInputFormat rdt_demuxer;
+extern AVInputFormat ff_rdt_demuxer;
 
 /**
  * Read the MDPR chunk, which contains stream-specific codec initialization
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 436a7e0..da7e6b2 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -935,7 +935,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
     return dts;
 }
 
-AVInputFormat rm_demuxer = {
+AVInputFormat ff_rm_demuxer = {
     "rm",
     NULL_IF_CONFIG_SMALL("RealMedia format"),
     sizeof(RMDemuxContext),
@@ -947,7 +947,7 @@ AVInputFormat rm_demuxer = {
     rm_read_dts,
 };
 
-AVInputFormat rdt_demuxer = {
+AVInputFormat ff_rdt_demuxer = {
     "rdt",
     NULL_IF_CONFIG_SMALL("RDT demuxer"),
     sizeof(RMDemuxContext),
diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c
index 3b96d13..5670d95 100644
--- a/libavformat/rmenc.c
+++ b/libavformat/rmenc.c
@@ -457,7 +457,7 @@ static int rm_write_trailer(AVFormatContext *s)
 }
 
 
-AVOutputFormat rm_muxer = {
+AVOutputFormat ff_rm_muxer = {
     "rm",
     NULL_IF_CONFIG_SMALL("RealMedia format"),
     "application/vnd.rn-realmedia",
diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index f0fba3e..241b541 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -349,7 +349,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat rpl_demuxer = {
+AVInputFormat ff_rpl_demuxer = {
     "rpl",
     NULL_IF_CONFIG_SMALL("RPL/ARMovie format"),
     sizeof(RPLContext),
diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c
index e86b8e7..698f82e 100644
--- a/libavformat/rsodec.c
+++ b/libavformat/rsodec.c
@@ -88,7 +88,7 @@ static int rso_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat rso_demuxer = {
+AVInputFormat ff_rso_demuxer = {
     .name           =   "rso",
     .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
     .extensions     =   "rso",
diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c
index 5e670f4..7b13898 100644
--- a/libavformat/rsoenc.c
+++ b/libavformat/rsoenc.c
@@ -100,7 +100,7 @@ static int rso_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat rso_muxer = {
+AVOutputFormat ff_rso_muxer = {
     .name           =   "rso",
     .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
     .extensions     =   "rso",
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index abe8675..3ad49d6 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -989,7 +989,7 @@ static int rtmp_write(URLContext *h, const uint8_t *buf, int size)
     return size;
 }
 
-URLProtocol rtmp_protocol = {
+URLProtocol ff_rtmp_protocol = {
     "rtmp",
     rtmp_open,
     rtmp_read,
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index e31a825..db09f8f 100644
--- a/libavformat/rtpdec_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -109,7 +109,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
             av_close_input_stream(rt->asf_ctx);
             rt->asf_ctx = NULL;
         }
-        ret = av_open_input_stream(&rt->asf_ctx, &pb, "", &asf_demuxer, NULL);
+        ret = av_open_input_stream(&rt->asf_ctx, &pb, "", &ff_asf_demuxer, NULL);
         if (ret < 0)
             return ret;
         av_metadata_copy(&s->metadata, rt->asf_ctx->metadata, 0);
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index d5f0b38..839a05c 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -444,7 +444,7 @@ static int rtp_write_trailer(AVFormatContext *s1)
     return 0;
 }
 
-AVOutputFormat rtp_muxer = {
+AVOutputFormat ff_rtp_muxer = {
     "rtp",
     NULL_IF_CONFIG_SMALL("RTP output format"),
     NULL,
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 0e2abf5..6ef6784 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -359,7 +359,7 @@ int rtp_get_rtcp_file_handle(URLContext *h) {
     return s->rtcp_fd;
 }
 
-URLProtocol rtp_protocol = {
+URLProtocol ff_rtp_protocol = {
     "rtp",
     rtp_open,
     rtp_read,
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 8ff4de7..752f429 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1825,7 +1825,7 @@ static int sdp_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat sdp_demuxer = {
+AVInputFormat ff_sdp_demuxer = {
     "sdp",
     NULL_IF_CONFIG_SMALL("SDP"),
     sizeof(RTSPState),
@@ -1929,7 +1929,7 @@ fail:
     return ret;
 }
 
-AVInputFormat rtp_demuxer = {
+AVInputFormat ff_rtp_demuxer = {
     "rtp",
     NULL_IF_CONFIG_SMALL("RTP input format"),
     sizeof(RTSPState),
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 6a4b4af..55996e3 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -395,7 +395,7 @@ static int rtsp_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat rtsp_demuxer = {
+AVInputFormat ff_rtsp_demuxer = {
     "rtsp",
     NULL_IF_CONFIG_SMALL("RTSP input format"),
     sizeof(RTSPState),
diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c
index 3a0b2c7..dc8ecd8 100644
--- a/libavformat/rtspenc.c
+++ b/libavformat/rtspenc.c
@@ -233,7 +233,7 @@ static int rtsp_write_close(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat rtsp_muxer = {
+AVOutputFormat ff_rtsp_muxer = {
     "rtsp",
     NULL_IF_CONFIG_SMALL("RTSP output format"),
     NULL,
diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c
index 701eae2..208591c 100644
--- a/libavformat/sapdec.c
+++ b/libavformat/sapdec.c
@@ -226,7 +226,7 @@ static int sap_fetch_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat sap_demuxer = {
+AVInputFormat ff_sap_demuxer = {
     "sap",
     NULL_IF_CONFIG_SMALL("SAP input format"),
     sizeof(struct SAPState),
diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index 581cec6..b14c511 100644
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
@@ -250,7 +250,7 @@ static int sap_write_packet(AVFormatContext *s, AVPacket *pkt)
     return ff_write_chained(rtpctx, 0, pkt, s);
 }
 
-AVOutputFormat sap_muxer = {
+AVOutputFormat ff_sap_muxer = {
     "sap",
     NULL_IF_CONFIG_SMALL("SAP output format"),
     NULL,
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 6274041..4f3e5b9 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -282,7 +282,7 @@ static int film_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat segafilm_demuxer = {
+AVInputFormat ff_segafilm_demuxer = {
     "film_cpk",
     NULL_IF_CONFIG_SMALL("Sega FILM/CPK format"),
     sizeof(FilmDemuxContext),
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index c239f5c..98fe95a 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -280,7 +280,7 @@ static int vmd_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat vmd_demuxer = {
+AVInputFormat ff_vmd_demuxer = {
     "vmd",
     NULL_IF_CONFIG_SMALL("Sierra VMD format"),
     sizeof(VmdDemuxContext),
diff --git a/libavformat/siff.c b/libavformat/siff.c
index 3a0b9bb..5219368 100644
--- a/libavformat/siff.c
+++ b/libavformat/siff.c
@@ -227,7 +227,7 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
     return pkt->size;
 }
 
-AVInputFormat siff_demuxer = {
+AVInputFormat ff_siff_demuxer = {
     "siff",
     NULL_IF_CONFIG_SMALL("Beam Software SIFF"),
     sizeof(SIFFContext),
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 89e9e35..71a968e 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -344,7 +344,7 @@ static int smacker_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat smacker_demuxer = {
+AVInputFormat ff_smacker_demuxer = {
     "smk",
     NULL_IF_CONFIG_SMALL("Smacker video"),
     sizeof(SmackerContext),
diff --git a/libavformat/sol.c b/libavformat/sol.c
index 5573ddd..fd7eb66 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -141,7 +141,7 @@ static int sol_read_packet(AVFormatContext *s,
     return 0;
 }
 
-AVInputFormat sol_demuxer = {
+AVInputFormat ff_sol_demuxer = {
     "sol",
     NULL_IF_CONFIG_SMALL("Sierra SOL format"),
     0,
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
index 10c5bbe..0a57f48 100644
--- a/libavformat/soxdec.c
+++ b/libavformat/soxdec.c
@@ -140,7 +140,7 @@ static int sox_read_packet(AVFormatContext *s,
     return 0;
 }
 
-AVInputFormat sox_demuxer = {
+AVInputFormat ff_sox_demuxer = {
     "sox",
     NULL_IF_CONFIG_SMALL("SoX native format"),
     0,
diff --git a/libavformat/soxenc.c b/libavformat/soxenc.c
index 918bfad..413a538 100644
--- a/libavformat/soxenc.c
+++ b/libavformat/soxenc.c
@@ -112,7 +112,7 @@ static int sox_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat sox_muxer = {
+AVOutputFormat ff_sox_muxer = {
     "sox",
     NULL_IF_CONFIG_SMALL("SoX native format"),
     NULL,
diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c
index 05a9145..5c4dba0 100644
--- a/libavformat/spdifdec.c
+++ b/libavformat/spdifdec.c
@@ -225,7 +225,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat spdif_demuxer = {
+AVInputFormat ff_spdif_demuxer = {
     "spdif",
     NULL_IF_CONFIG_SMALL("IEC 61937 (compressed data in S/PDIF)"),
     0,
diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c
index d7a71e1..3eea31e 100644
--- a/libavformat/spdifenc.c
+++ b/libavformat/spdifenc.c
@@ -382,7 +382,7 @@ static int spdif_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat spdif_muxer = {
+AVOutputFormat ff_spdif_muxer = {
     "spdif",
     NULL_IF_CONFIG_SMALL("IEC 61937 (used on S/PDIF - IEC958)"),
     NULL,
diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index 104031a..17de8c9 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -92,7 +92,7 @@ static int srt_read_packet(AVFormatContext *s, AVPacket *pkt)
     return res;
 }
 
-AVInputFormat srt_demuxer = {
+AVInputFormat ff_srt_demuxer = {
     .name        = "srt",
     .long_name   = NULL_IF_CONFIG_SMALL("SubRip subtitle format"),
     .read_probe  = srt_probe,
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 64f775f..d2a84f0 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -207,7 +207,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat swf_demuxer = {
+AVInputFormat ff_swf_demuxer = {
     "swf",
     NULL_IF_CONFIG_SMALL("Flash format"),
     sizeof(SWFContext),
diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c
index 1a1a9ab..1ade1bf 100644
--- a/libavformat/swfenc.c
+++ b/libavformat/swfenc.c
@@ -506,7 +506,7 @@ static int swf_write_trailer(AVFormatContext *s)
 }
 
 #if CONFIG_SWF_MUXER
-AVOutputFormat swf_muxer = {
+AVOutputFormat ff_swf_muxer = {
     "swf",
     NULL_IF_CONFIG_SMALL("Flash format"),
     "application/x-shockwave-flash",
@@ -520,7 +520,7 @@ AVOutputFormat swf_muxer = {
 };
 #endif
 #if CONFIG_AVM2_MUXER
-AVOutputFormat avm2_muxer = {
+AVOutputFormat ff_avm2_muxer = {
     "avm2",
     NULL_IF_CONFIG_SMALL("Flash 9 (AVM2) format"),
     "application/x-shockwave-flash",
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 14b5e19..5cb4b8f 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -218,7 +218,7 @@ static int tcp_get_file_handle(URLContext *h)
     return s->fd;
 }
 
-URLProtocol tcp_protocol = {
+URLProtocol ff_tcp_protocol = {
     "tcp",
     tcp_open,
     tcp_read,
diff --git a/libavformat/thp.c b/libavformat/thp.c
index 82966dd..226f2fd 100644
--- a/libavformat/thp.c
+++ b/libavformat/thp.c
@@ -187,7 +187,7 @@ static int thp_read_packet(AVFormatContext *s,
     return 0;
 }
 
-AVInputFormat thp_demuxer = {
+AVInputFormat ff_thp_demuxer = {
     "thp",
     NULL_IF_CONFIG_SMALL("THP"),
     sizeof(ThpDemuxContext),
diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c
index 938eea5..2992fa1 100644
--- a/libavformat/tiertexseq.c
+++ b/libavformat/tiertexseq.c
@@ -302,7 +302,7 @@ static int seq_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat tiertexseq_demuxer = {
+AVInputFormat ff_tiertexseq_demuxer = {
     "tiertexseq",
     NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ format"),
     sizeof(SeqDemuxContext),
diff --git a/libavformat/tmv.c b/libavformat/tmv.c
index 4be2f32..72d0f29 100644
--- a/libavformat/tmv.c
+++ b/libavformat/tmv.c
@@ -178,7 +178,7 @@ static int tmv_read_seek(AVFormatContext *s, int stream_index,
     return 0;
 }
 
-AVInputFormat tmv_demuxer = {
+AVInputFormat ff_tmv_demuxer = {
     "tmv",
     NULL_IF_CONFIG_SMALL("8088flex TMV"),
     sizeof(TMVContext),
diff --git a/libavformat/tta.c b/libavformat/tta.c
index 64ed4d8..21b7538 100644
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -143,7 +143,7 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
     return 0;
 }
 
-AVInputFormat tta_demuxer = {
+AVInputFormat ff_tta_demuxer = {
     "tta",
     NULL_IF_CONFIG_SMALL("True Audio"),
     sizeof(TTAContext),
diff --git a/libavformat/tty.c b/libavformat/tty.c
index 78db4ee..0adbaf1 100644
--- a/libavformat/tty.c
+++ b/libavformat/tty.c
@@ -124,7 +124,7 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat tty_demuxer = {
+AVInputFormat ff_tty_demuxer = {
     .name           = "tty",
     .long_name      = NULL_IF_CONFIG_SMALL("Tele-typewriter"),
     .priv_data_size = sizeof(TtyDemuxContext),
diff --git a/libavformat/txd.c b/libavformat/txd.c
index 38bdb1b..eb5e8b3 100644
--- a/libavformat/txd.c
+++ b/libavformat/txd.c
@@ -90,7 +90,7 @@ next_chunk:
     return 0;
 }
 
-AVInputFormat txd_demuxer =
+AVInputFormat ff_txd_demuxer =
 {
     "txd",
     NULL_IF_CONFIG_SMALL("Renderware TeXture Dictionary"),
diff --git a/libavformat/udp.c b/libavformat/udp.c
index 0b62c6d..8080c98 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -498,7 +498,7 @@ static int udp_close(URLContext *h)
     return 0;
 }
 
-URLProtocol udp_protocol = {
+URLProtocol ff_udp_protocol = {
     "udp",
     udp_open,
     udp_read,
diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c
index 7a006f2..8dd735d 100644
--- a/libavformat/vc1test.c
+++ b/libavformat/vc1test.c
@@ -109,7 +109,7 @@ static int vc1t_read_packet(AVFormatContext *s,
     return pkt->size;
 }
 
-AVInputFormat vc1t_demuxer = {
+AVInputFormat ff_vc1t_demuxer = {
     "vc1test",
     NULL_IF_CONFIG_SMALL("VC-1 test bitstream format"),
     0,
diff --git a/libavformat/vc1testenc.c b/libavformat/vc1testenc.c
index b4b1e02..507b332 100644
--- a/libavformat/vc1testenc.c
+++ b/libavformat/vc1testenc.c
@@ -80,7 +80,7 @@ static int vc1test_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat vc1t_muxer = {
+AVOutputFormat ff_vc1t_muxer = {
     "rcv",
     NULL_IF_CONFIG_SMALL("VC-1 test bitstream"),
     "",
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 59c84b7..7ef29d8 100644
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -156,7 +156,7 @@ static int voc_read_packet(AVFormatContext *s, AVPacket *pkt)
     return voc_get_packet(s, pkt, s->streams[0], 0);
 }
 
-AVInputFormat voc_demuxer = {
+AVInputFormat ff_voc_demuxer = {
     "voc",
     NULL_IF_CONFIG_SMALL("Creative Voice file format"),
     sizeof(VocDecContext),
diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c
index 2d3472e..8d181de 100644
--- a/libavformat/vocenc.c
+++ b/libavformat/vocenc.c
@@ -89,7 +89,7 @@ static int voc_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat voc_muxer = {
+AVOutputFormat ff_voc_muxer = {
     "voc",
     NULL_IF_CONFIG_SMALL("Creative Voice file format"),
     "audio/x-voc",
diff --git a/libavformat/vqf.c b/libavformat/vqf.c
index b0ec020..9cf0c3a 100644
--- a/libavformat/vqf.c
+++ b/libavformat/vqf.c
@@ -247,7 +247,7 @@ static int vqf_read_seek(AVFormatContext *s,
     return 0;
 }
 
-AVInputFormat vqf_demuxer = {
+AVInputFormat ff_vqf_demuxer = {
     "vqf",
     NULL_IF_CONFIG_SMALL("Nippon Telegraph and Telephone Corporation (NTT) TwinVQ"),
     sizeof(VqfContext),
diff --git a/libavformat/wav.c b/libavformat/wav.c
index 894c0c0..4cf138c 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -123,7 +123,7 @@ static int wav_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat wav_muxer = {
+AVOutputFormat ff_wav_muxer = {
     "wav",
     NULL_IF_CONFIG_SMALL("WAV format"),
     "audio/x-wav",
@@ -340,7 +340,7 @@ static int wav_read_seek(AVFormatContext *s,
     return pcm_read_seek(s, stream_index, timestamp, flags);
 }
 
-AVInputFormat wav_demuxer = {
+AVInputFormat ff_wav_demuxer = {
     "wav",
     NULL_IF_CONFIG_SMALL("WAV format"),
     sizeof(WAVContext),
@@ -426,7 +426,7 @@ static int w64_read_header(AVFormatContext *s, AVFormatParameters *ap)
     return 0;
 }
 
-AVInputFormat w64_demuxer = {
+AVInputFormat ff_w64_demuxer = {
     "w64",
     NULL_IF_CONFIG_SMALL("Sony Wave64 format"),
     sizeof(WAVContext),
diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
index 03d79e5..1757159 100644
--- a/libavformat/wc3movie.c
+++ b/libavformat/wc3movie.c
@@ -291,7 +291,7 @@ static int wc3_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat wc3_demuxer = {
+AVInputFormat ff_wc3_demuxer = {
     "wc3movie",
     NULL_IF_CONFIG_SMALL("Wing Commander III movie format"),
     sizeof(Wc3DemuxContext),
diff --git a/libavformat/westwood.c b/libavformat/westwood.c
index 10d5798..85d2056 100644
--- a/libavformat/westwood.c
+++ b/libavformat/westwood.c
@@ -367,7 +367,7 @@ static int wsvqa_read_packet(AVFormatContext *s,
 }
 
 #if CONFIG_WSAUD_DEMUXER
-AVInputFormat wsaud_demuxer = {
+AVInputFormat ff_wsaud_demuxer = {
     "wsaud",
     NULL_IF_CONFIG_SMALL("Westwood Studios audio format"),
     sizeof(WsAudDemuxContext),
@@ -377,7 +377,7 @@ AVInputFormat wsaud_demuxer = {
 };
 #endif
 #if CONFIG_WSVQA_DEMUXER
-AVInputFormat wsvqa_demuxer = {
+AVInputFormat ff_wsvqa_demuxer = {
     "wsvqa",
     NULL_IF_CONFIG_SMALL("Westwood Studios VQA format"),
     sizeof(WsVqaDemuxContext),
diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index ad6463d..816c406 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -595,7 +595,7 @@ static int read_seek2(AVFormatContext *s, int stream_index,
     }
 }
 
-AVInputFormat wtv_demuxer = {
+AVInputFormat ff_wtv_demuxer = {
     .name           = "wtv",
     .long_name      = NULL_IF_CONFIG_SMALL("Windows Television (WTV)"),
     .priv_data_size = sizeof(WtvContext),
diff --git a/libavformat/wv.c b/libavformat/wv.c
index 367ce45..667ae2e 100644
--- a/libavformat/wv.c
+++ b/libavformat/wv.c
@@ -339,7 +339,7 @@ static int wv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
     return 0;
 }
 
-AVInputFormat wv_demuxer = {
+AVInputFormat ff_wv_demuxer = {
     "wv",
     NULL_IF_CONFIG_SMALL("WavPack"),
     sizeof(WVContext),
diff --git a/libavformat/xa.c b/libavformat/xa.c
index 3a866b9..21a6b26 100644
--- a/libavformat/xa.c
+++ b/libavformat/xa.c
@@ -118,7 +118,7 @@ static int xa_read_packet(AVFormatContext *s,
     return ret;
 }
 
-AVInputFormat xa_demuxer = {
+AVInputFormat ff_xa_demuxer = {
     "xa",
     NULL_IF_CONFIG_SMALL("Maxis XA File Format"),
     sizeof(MaxisXADemuxContext),
diff --git a/libavformat/yop.c b/libavformat/yop.c
index 54d3845..ae90925 100644
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -202,7 +202,7 @@ static int yop_read_seek(AVFormatContext *s, int stream_index,
     return 0;
 }
 
-AVInputFormat yop_demuxer = {
+AVInputFormat ff_yop_demuxer = {
     "yop",
     NULL_IF_CONFIG_SMALL("Psygnosis YOP Format"),
     sizeof(YopDecContext),
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index 3a48864..6c76398 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -169,7 +169,7 @@ static int yuv4_write_header(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat yuv4mpegpipe_muxer = {
+AVOutputFormat ff_yuv4mpegpipe_muxer = {
     "yuv4mpegpipe",
     NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
     "",
@@ -390,7 +390,7 @@ static int yuv4_probe(AVProbeData *pd)
 }
 
 #if CONFIG_YUV4MPEGPIPE_DEMUXER
-AVInputFormat yuv4mpegpipe_demuxer = {
+AVInputFormat ff_yuv4mpegpipe_demuxer = {
     "yuv4mpegpipe",
     NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
     sizeof(struct frame_attributes),
-- 
1.7.4.rc2




More information about the ffmpeg-devel mailing list