1. ffmpeg
  2. Commit c6610a216ed2948885772154a2eed696e0cb4aca
Browse code

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.

Diego Elio Pettenò authored on 2011/01/26 07:03:28
Showing 186 changed files
libavdevice/alldevices.c
History View file @ c6610a2
... ... 
@@ -23,11 +23,11 @@
23 23 
 #include "avdevice.h"
24 24
25 25 
 #define REGISTER_OUTDEV(X,x) { \
26 
-          extern AVOutputFormat x##_muxer; \
27 
-          if(CONFIG_##X##_OUTDEV)  av_register_output_format(&x##_muxer); }
26 
+          extern AVOutputFormat ff_##x##_muxer; \
27 
+          if(CONFIG_##X##_OUTDEV)  av_register_output_format(&ff_##x##_muxer); }
28 28 
 #define REGISTER_INDEV(X,x) { \
29 
-          extern AVInputFormat x##_demuxer; \
30 
-          if(CONFIG_##X##_INDEV)   av_register_input_format(&x##_demuxer); }
29 
+          extern AVInputFormat ff_##x##_demuxer; \
30 
+          if(CONFIG_##X##_INDEV)   av_register_input_format(&ff_##x##_demuxer); }
31 31 
 #define REGISTER_INOUTDEV(X,x)  REGISTER_OUTDEV(X,x); REGISTER_INDEV(X,x)
32 32
33 33 
 void avdevice_register_all(void)
libavdevice/alsa-audio-dec.c
History View file @ c6610a2
... ... 
@@ -163,7 +163,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
163 163 
     return 0;
164 164 
 }
165 165
166 
-AVInputFormat alsa_demuxer = {
166 
+AVInputFormat ff_alsa_demuxer = {
167 167 
     "alsa",
168 168 
     NULL_IF_CONFIG_SMALL("ALSA audio input"),
169 169 
     sizeof(AlsaData),
libavdevice/alsa-audio-enc.c
History View file @ c6610a2
... ... 
@@ -93,7 +93,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
93 93 
     return 0;
94 94 
 }
95 95
96 
-AVOutputFormat alsa_muxer = {
96 
+AVOutputFormat ff_alsa_muxer = {
97 97 
     "alsa",
98 98 
     NULL_IF_CONFIG_SMALL("ALSA audio output"),
99 99 
     "",
libavdevice/bktr.c
History View file @ c6610a2
... ... 
@@ -314,7 +314,7 @@ static int grab_read_close(AVFormatContext *s1)
314 314 
     return 0;
315 315 
 }
316 316
317 
-AVInputFormat bktr_demuxer = {
317 
+AVInputFormat ff_bktr_demuxer = {
318 318 
     "bktr",
319 319 
     NULL_IF_CONFIG_SMALL("video grab"),
320 320 
     sizeof(VideoData),
libavdevice/dv1394.c
History View file @ c6610a2
... ... 
@@ -227,7 +227,7 @@ static int dv1394_close(AVFormatContext * context)
227 227 
     return 0;
228 228 
 }
229 229
230 
-AVInputFormat dv1394_demuxer = {
230 
+AVInputFormat ff_dv1394_demuxer = {
231 231 
     .name           = "dv1394",
232 232 
     .long_name      = NULL_IF_CONFIG_SMALL("DV1394 A/V grab"),
233 233 
     .priv_data_size = sizeof(struct dv1394_data),
libavdevice/jack_audio.c
History View file @ c6610a2
... ... 
@@ -314,7 +314,7 @@ static int audio_read_close(AVFormatContext *context)
314 314 
     return 0;
315 315 
 }
316 316
317 
-AVInputFormat jack_demuxer = {
317 
+AVInputFormat ff_jack_demuxer = {
318 318 
     "jack",
319 319 
     NULL_IF_CONFIG_SMALL("JACK Audio Connection Kit"),
320 320 
     sizeof(JackData),
libavdevice/libdc1394.c
History View file @ c6610a2
... ... 
@@ -348,7 +348,7 @@ static int dc1394_v2_close(AVFormatContext * context)
348 348 
     return 0;
349 349 
 }
350 350
351 
-AVInputFormat libdc1394_demuxer = {
351 
+AVInputFormat ff_libdc1394_demuxer = {
352 352 
     .name           = "libdc1394",
353 353 
     .long_name      = NULL_IF_CONFIG_SMALL("dc1394 v.2 A/V grab"),
354 354 
     .priv_data_size = sizeof(struct dc1394_data),
... ... 
@@ -360,7 +360,7 @@ AVInputFormat libdc1394_demuxer = {
360 360
361 361 
 #endif
362 362 
 #if HAVE_LIBDC1394_1
363 
-AVInputFormat libdc1394_demuxer = {
363 
+AVInputFormat ff_libdc1394_demuxer = {
364 364 
     .name           = "libdc1394",
365 365 
     .long_name      = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"),
366 366 
     .priv_data_size = sizeof(struct dc1394_data),
libavdevice/oss_audio.c
History View file @ c6610a2
... ... 
@@ -293,7 +293,7 @@ static int audio_read_close(AVFormatContext *s1)
293 293 
 }
294 294
295 295 
 #if CONFIG_OSS_INDEV
296 
-AVInputFormat oss_demuxer = {
296 
+AVInputFormat ff_oss_demuxer = {
297 297 
     "oss",
298 298 
     NULL_IF_CONFIG_SMALL("Open Sound System capture"),
299 299 
     sizeof(AudioData),
... ... 
@@ -306,7 +306,7 @@ AVInputFormat oss_demuxer = {
306 306 
 #endif
307 307
308 308 
 #if CONFIG_OSS_OUTDEV
309 
-AVOutputFormat oss_muxer = {
309 
+AVOutputFormat ff_oss_muxer = {
310 310 
     "oss",
311 311 
     NULL_IF_CONFIG_SMALL("Open Sound System playback"),
312 312 
     "",
libavdevice/v4l.c
History View file @ c6610a2
... ... 
@@ -339,7 +339,7 @@ static int grab_read_close(AVFormatContext *s1)
339 339 
     return 0;
340 340 
 }
341 341
342 
-AVInputFormat v4l_demuxer = {
342 
+AVInputFormat ff_v4l_demuxer = {
343 343 
     "video4linux",
344 344 
     NULL_IF_CONFIG_SMALL("Video4Linux device grab"),
345 345 
     sizeof(VideoData),
libavdevice/v4l2.c
History View file @ c6610a2
... ... 
@@ -680,7 +680,7 @@ static int v4l2_read_close(AVFormatContext *s1)
680 680 
     return 0;
681 681 
 }
682 682
683 
-AVInputFormat v4l2_demuxer = {
683 
+AVInputFormat ff_v4l2_demuxer = {
684 684 
     "video4linux2",
685 685 
     NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"),
686 686 
     sizeof(struct video_data),
libavdevice/vfwcap.c
History View file @ c6610a2
... ... 
@@ -452,7 +452,7 @@ static int vfw_read_packet(AVFormatContext *s, AVPacket *pkt)
452 452 
     return pkt->size;
453 453 
 }
454 454
455 
-AVInputFormat vfwcap_demuxer = {
455 
+AVInputFormat ff_vfwcap_demuxer = {
456 456 
     "vfwcap",
457 457 
     NULL_IF_CONFIG_SMALL("VFW video capture"),
458 458 
     sizeof(struct vfw_ctx),
libavdevice/x11grab.c
History View file @ c6610a2
... ... 
@@ -442,7 +442,7 @@ x11grab_read_close(AVFormatContext *s1)
442 442 
 }
443 443
444 444 
 /** x11 grabber device demuxer declaration */
445 
-AVInputFormat x11_grab_device_demuxer =
445 
+AVInputFormat ff_x11_grab_device_demuxer =
446 446 
 {
447 447 
     "x11grab",
448 448 
     NULL_IF_CONFIG_SMALL("X11grab"),
libavformat/4xm.c
History View file @ c6610a2
... ... 
@@ -343,7 +343,7 @@ static int fourxm_read_close(AVFormatContext *s)
343 343 
     return 0;
344 344 
 }
345 345
346 
-AVInputFormat fourxm_demuxer = {
346 
+AVInputFormat ff_fourxm_demuxer = {
347 347 
     "4xm",
348 348 
     NULL_IF_CONFIG_SMALL("4X Technologies format"),
349 349 
     sizeof(FourxmDemuxContext),
libavformat/a64.c
History View file @ c6610a2
... ... 
@@ -164,7 +164,7 @@ static int a64_write_trailer(struct AVFormatContext *s)
164 164 
     return 0;
165 165 
 }
166 166
167 
-AVOutputFormat a64_muxer = {
167 
+AVOutputFormat ff_a64_muxer = {
168 168 
     .name = "a64",
169 169 
     .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
170 170 
     .mime_type = NULL,
libavformat/aacdec.c
History View file @ c6610a2
... ... 
@@ -81,7 +81,7 @@ static int adts_aac_read_header(AVFormatContext *s,
81 81 
     return 0;
82 82 
 }
83 83
84 
-AVInputFormat aac_demuxer = {
84 
+AVInputFormat ff_aac_demuxer = {
85 85 
     "aac",
86 86 
     NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
87 87 
     0,
libavformat/ac3dec.c
History View file @ c6610a2
... ... 
@@ -70,7 +70,7 @@ static int ac3_probe(AVProbeData *p)
70 70 
     return ac3_eac3_probe(p, CODEC_ID_AC3);
71 71 
 }
72 72
73 
-AVInputFormat ac3_demuxer = {
73 
+AVInputFormat ff_ac3_demuxer = {
74 74 
     "ac3",
75 75 
     NULL_IF_CONFIG_SMALL("raw AC-3"),
76 76 
     0,
... ... 
@@ -89,7 +89,7 @@ static int eac3_probe(AVProbeData *p)
89 89 
     return ac3_eac3_probe(p, CODEC_ID_EAC3);
90 90 
 }
91 91
92 
-AVInputFormat eac3_demuxer = {
92 
+AVInputFormat ff_eac3_demuxer = {
93 93 
     "eac3",
94 94 
     NULL_IF_CONFIG_SMALL("raw E-AC-3"),
95 95 
     0,
libavformat/adtsenc.c
History View file @ c6610a2
... ... 
@@ -137,7 +137,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
137 137 
     return 0;
138 138 
 }
139 139
140 
-AVOutputFormat adts_muxer = {
140 
+AVOutputFormat ff_adts_muxer = {
141 141 
     "adts",
142 142 
     NULL_IF_CONFIG_SMALL("ADTS AAC"),
143 143 
     "audio/aac",
libavformat/aea.c
History View file @ c6610a2
... ... 
@@ -93,7 +93,7 @@ static int aea_read_packet(AVFormatContext *s, AVPacket *pkt)
93 93 
     return ret;
94 94 
 }
95 95
96 
-AVInputFormat aea_demuxer = {
96 
+AVInputFormat ff_aea_demuxer = {
97 97 
     "aea",
98 98 
     NULL_IF_CONFIG_SMALL("MD STUDIO audio"),
99 99 
     0,
libavformat/aiffdec.c
History View file @ c6610a2
... ... 
@@ -311,7 +311,7 @@ static int aiff_read_packet(AVFormatContext *s,
311 311 
     return 0;
312 312 
 }
313 313
314 
-AVInputFormat aiff_demuxer = {
314 
+AVInputFormat ff_aiff_demuxer = {
315 315 
     "aiff",
316 316 
     NULL_IF_CONFIG_SMALL("Audio IFF"),
317 317 
     sizeof(AIFFInputContext),
libavformat/aiffenc.c
History View file @ c6610a2
... ... 
@@ -145,7 +145,7 @@ static int aiff_write_trailer(AVFormatContext *s)
145 145 
     return 0;
146 146 
 }
147 147
148 
-AVOutputFormat aiff_muxer = {
148 
+AVOutputFormat ff_aiff_muxer = {
149 149 
     "aiff",
150 150 
     NULL_IF_CONFIG_SMALL("Audio IFF"),
151 151 
     "audio/aiff",
libavformat/allformats.c
History View file @ c6610a2
... ... 
@@ -23,18 +23,18 @@
23 23 
 #include "rdt.h"
24 24
25 25 
 #define REGISTER_MUXER(X,x) { \
26 
-    extern AVOutputFormat x##_muxer; \
27 
-    if(CONFIG_##X##_MUXER) av_register_output_format(&x##_muxer); }
26 
+    extern AVOutputFormat ff_##x##_muxer; \
27 
+    if(CONFIG_##X##_MUXER) av_register_output_format(&ff_##x##_muxer); }
28 28
29 29 
 #define REGISTER_DEMUXER(X,x) { \
30 
-    extern AVInputFormat x##_demuxer; \
31 
-    if(CONFIG_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
30 
+    extern AVInputFormat ff_##x##_demuxer; \
31 
+    if(CONFIG_##X##_DEMUXER) av_register_input_format(&ff_##x##_demuxer); }
32 32
33 33 
 #define REGISTER_MUXDEMUX(X,x)  REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
34 34
35 35 
 #define REGISTER_PROTOCOL(X,x) { \
36 
-    extern URLProtocol x##_protocol; \
37 
-    if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&x##_protocol, sizeof(x##_protocol)); }
36 
+    extern URLProtocol ff_##x##_protocol; \
37 
+    if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&ff_##x##_protocol, sizeof(ff_##x##_protocol)); }
38 38
39 39 
 void av_register_all(void)
40 40 
 {
libavformat/amr.c
History View file @ c6610a2
... ... 
@@ -169,7 +169,7 @@ static int amr_read_packet(AVFormatContext *s,
169 169 
 }
170 170
171 171 
 #if CONFIG_AMR_DEMUXER
172 
-AVInputFormat amr_demuxer = {
172 
+AVInputFormat ff_amr_demuxer = {
173 173 
     "amr",
174 174 
     NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
175 175 
     0, /*priv_data_size*/
... ... 
@@ -181,7 +181,7 @@ AVInputFormat amr_demuxer = {
181 181 
 #endif
182 182
183 183 
 #if CONFIG_AMR_MUXER
184 
-AVOutputFormat amr_muxer = {
184 
+AVOutputFormat ff_amr_muxer = {
185 185 
     "amr",
186 186 
     NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
187 187 
     "audio/amr",
libavformat/anm.c
History View file @ c6610a2
... ... 
@@ -225,7 +225,7 @@ repeat:
225 225 
     return 0;
226 226 
 }
227 227
228 
-AVInputFormat anm_demuxer = {
228 
+AVInputFormat ff_anm_demuxer = {
229 229 
     "anm",
230 230 
     NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
231 231 
     sizeof(AnmDemuxContext),
libavformat/apc.c
History View file @ c6610a2
... ... 
@@ -80,7 +80,7 @@ static int apc_read_packet(AVFormatContext *s, AVPacket *pkt)
80 80 
     return 0;
81 81 
 }
82 82
83 
-AVInputFormat apc_demuxer = {
83 
+AVInputFormat ff_apc_demuxer = {
84 84 
     "apc",
85 85 
     NULL_IF_CONFIG_SMALL("CRYO APC format"),
86 86 
     0,
libavformat/ape.c
History View file @ c6610a2
... ... 
@@ -391,7 +391,7 @@ static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
391 391 
     return 0;
392 392 
 }
393 393
394 
-AVInputFormat ape_demuxer = {
394 
+AVInputFormat ff_ape_demuxer = {
395 395 
     "ape",
396 396 
     NULL_IF_CONFIG_SMALL("Monkey's Audio"),
397 397 
     sizeof(APEContext),
libavformat/applehttp.c
History View file @ c6610a2
... ... 
@@ -579,7 +579,7 @@ static int applehttp_probe(AVProbeData *p)
579 579 
     return 0;
580 580 
 }
581 581
582 
-AVInputFormat applehttp_demuxer = {
582 
+AVInputFormat ff_applehttp_demuxer = {
583 583 
     "applehttp",
584 584 
     NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming format"),
585 585 
     sizeof(AppleHTTPContext),
libavformat/asf.h
History View file @ c6610a2
... ... 
@@ -229,7 +229,7 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
229 229
230 230 
 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
231 231
232 
-extern AVInputFormat asf_demuxer;
232 
+extern AVInputFormat ff_asf_demuxer;
233 233 
 int ff_guidcmp(const void *g1, const void *g2);
234 234 
 void ff_get_guid(ByteIOContext *s, ff_asf_guid *g);
235 235
libavformat/asfdec.c
History View file @ c6610a2
... ... 
@@ -1203,7 +1203,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
1203 1203 
     return 0;
1204 1204 
 }
1205 1205
1206 
-AVInputFormat asf_demuxer = {
1206 
+AVInputFormat ff_asf_demuxer = {
1207 1207 
     "asf",
1208 1208 
     NULL_IF_CONFIG_SMALL("ASF format"),
1209 1209 
     sizeof(ASFContext),
libavformat/asfenc.c
History View file @ c6610a2
... ... 
@@ -855,7 +855,7 @@ static int asf_write_trailer(AVFormatContext *s)
855 855 
 }
856 856
857 857 
 #if CONFIG_ASF_MUXER
858 
-AVOutputFormat asf_muxer = {
858 
+AVOutputFormat ff_asf_muxer = {
859 859 
     "asf",
860 860 
     NULL_IF_CONFIG_SMALL("ASF format"),
861 861 
     "video/x-ms-asf",
... ... 
@@ -876,7 +876,7 @@ AVOutputFormat asf_muxer = {
876 876 
 #endif
877 877
878 878 
 #if CONFIG_ASF_STREAM_MUXER
879 
-AVOutputFormat asf_stream_muxer = {
879 
+AVOutputFormat ff_asf_stream_muxer = {
880 880 
     "asf_stream",
881 881 
     NULL_IF_CONFIG_SMALL("ASF format"),
882 882 
     "video/x-ms-asf",
libavformat/assdec.c
History View file @ c6610a2
... ... 
@@ -202,7 +202,7 @@ static int read_seek2(AVFormatContext *s, int stream_index,
202 202 
     return 0;
203 203 
 }
204 204
205 
-AVInputFormat ass_demuxer = {
205 
+AVInputFormat ff_ass_demuxer = {
206 206 
     .name           = "ass",
207 207 
     .long_name      = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
208 208 
     .priv_data_size = sizeof(ASSContext),
libavformat/assenc.c
History View file @ c6610a2
... ... 
@@ -77,7 +77,7 @@ static int write_trailer(AVFormatContext *s)
77 77 
     return 0;
78 78 
 }
79 79
80 
-AVOutputFormat ass_muxer = {
80 
+AVOutputFormat ff_ass_muxer = {
81 81 
     .name           = "ass",
82 82 
     .long_name      = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
83 83 
     .mime_type      = "text/x-ssa",
libavformat/au.c
History View file @ c6610a2
... ... 
@@ -183,7 +183,7 @@ static int au_read_packet(AVFormatContext *s,
183 183 
 }
184 184
185 185 
 #if CONFIG_AU_DEMUXER
186 
-AVInputFormat au_demuxer = {
186 
+AVInputFormat ff_au_demuxer = {
187 187 
     "au",
188 188 
     NULL_IF_CONFIG_SMALL("SUN AU format"),
189 189 
     0,
... ... 
@@ -197,7 +197,7 @@ AVInputFormat au_demuxer = {
197 197 
 #endif
198 198
199 199 
 #if CONFIG_AU_MUXER
200 
-AVOutputFormat au_muxer = {
200 
+AVOutputFormat ff_au_muxer = {
201 201 
     "au",
202 202 
     NULL_IF_CONFIG_SMALL("SUN AU format"),
203 203 
     "audio/basic",
libavformat/avidec.c
History View file @ c6610a2
... ... 
@@ -1373,7 +1373,7 @@ static int avi_probe(AVProbeData *p)
1373 1373 
     return 0;
1374 1374 
 }
1375 1375
1376 
-AVInputFormat avi_demuxer = {
1376 
+AVInputFormat ff_avi_demuxer = {
1377 1377 
     "avi",
1378 1378 
     NULL_IF_CONFIG_SMALL("AVI format"),
1379 1379 
     sizeof(AVIContext),
libavformat/avienc.c
History View file @ c6610a2
... ... 
@@ -630,7 +630,7 @@ static int avi_write_trailer(AVFormatContext *s)
630 630 
     return res;
631 631 
 }
632 632
633 
-AVOutputFormat avi_muxer = {
633 
+AVOutputFormat ff_avi_muxer = {
634 634 
     "avi",
635 635 
     NULL_IF_CONFIG_SMALL("AVI format"),
636 636 
     "video/x-msvideo",
libavformat/avisynth.c
History View file @ c6610a2
... ... 
@@ -207,7 +207,7 @@ static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts,
207 207 
   return 0;
208 208 
 }
209 209
210 
-AVInputFormat avisynth_demuxer = {
210 
+AVInputFormat ff_avisynth_demuxer = {
211 211 
   "avs",
212 212 
   NULL_IF_CONFIG_SMALL("AVISynth"),
213 213 
   sizeof(AVISynthContext),
libavformat/avs.c
History View file @ c6610a2
... ... 
@@ -215,7 +215,7 @@ static int avs_read_close(AVFormatContext * s)
215 215 
     return 0;
216 216 
 }
217 217
218 
-AVInputFormat avs_demuxer = {
218 
+AVInputFormat ff_avs_demuxer = {
219 219 
     "avs",
220 220 
     NULL_IF_CONFIG_SMALL("AVS format"),
221 221 
     sizeof(AvsFormat),
libavformat/bethsoftvid.c
History View file @ c6610a2
... ... 
@@ -224,7 +224,7 @@ static int vid_read_packet(AVFormatContext *s,
224 224 
     return 0;
225 225 
 }
226 226
227 
-AVInputFormat bethsoftvid_demuxer = {
227 
+AVInputFormat ff_bethsoftvid_demuxer = {
228 228 
     "bethsoftvid",
229 229 
     NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"),
230 230 
     sizeof(BVID_DemuxContext),
libavformat/bfi.c
History View file @ c6610a2
... ... 
@@ -158,7 +158,7 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt)
158 158 
     return ret;
159 159 
 }
160 160
161 
-AVInputFormat bfi_demuxer = {
161 
+AVInputFormat ff_bfi_demuxer = {
162 162 
     "bfi",
163 163 
     NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
164 164 
     sizeof(BFIContext),
libavformat/bink.c
History View file @ c6610a2
... ... 
@@ -257,7 +257,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, in
257 257 
     return 0;
258 258 
 }
259 259
260 
-AVInputFormat bink_demuxer = {
260 
+AVInputFormat ff_bink_demuxer = {
261 261 
     "bink",
262 262 
     NULL_IF_CONFIG_SMALL("Bink"),
263 263 
     sizeof(BinkDemuxContext),
libavformat/c93.c
History View file @ c6610a2
... ... 
@@ -192,7 +192,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
192 192 
     return ret;
193 193 
 }
194 194
195 
-AVInputFormat c93_demuxer = {
195 
+AVInputFormat ff_c93_demuxer = {
196 196 
     "c93",
197 197 
     NULL_IF_CONFIG_SMALL("Interplay C93"),
198 198 
     sizeof(C93DemuxContext),
libavformat/cafdec.c
History View file @ c6610a2
... ... 
@@ -381,7 +381,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
381 381 
     return 0;
382 382 
 }
383 383
384 
-AVInputFormat caf_demuxer = {
384 
+AVInputFormat ff_caf_demuxer = {
385 385 
     "caf",
386 386 
     NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),
387 387 
     sizeof(CaffContext),
libavformat/cavsvideodec.c
History View file @ c6610a2
... ... 
@@ -65,7 +65,7 @@ static int cavsvideo_probe(AVProbeData *p)
65 65 
     return 0;
66 66 
 }
67 67
68 
-AVInputFormat cavsvideo_demuxer = {
68 
+AVInputFormat ff_cavsvideo_demuxer = {
69 69 
     "cavsvideo",
70 70 
     NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
71 71 
     0,
libavformat/cdg.c
History View file @ c6610a2
... ... 
@@ -55,7 +55,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
55 55 
     return ret;
56 56 
 }
57 57
58 
-AVInputFormat cdg_demuxer = {
58 
+AVInputFormat ff_cdg_demuxer = {
59 59 
     "cdg",
60 60 
     NULL_IF_CONFIG_SMALL("CD Graphics Format"),
61 61 
     0,
libavformat/concat.c
History View file @ c6610a2
... ... 
@@ -188,7 +188,7 @@ static int64_t concat_seek(URLContext *h, int64_t pos, int whence)
188 188 
     return result;
189 189 
 }
190 190
191 
-URLProtocol concat_protocol = {
191 
+URLProtocol ff_concat_protocol = {
192 192 
     "concat",
193 193 
     concat_open,
194 194 
     concat_read,
libavformat/crcenc.c
History View file @ c6610a2
... ... 
@@ -54,7 +54,7 @@ static int crc_write_trailer(struct AVFormatContext *s)
54 54 
     return 0;
55 55 
 }
56 56
57 
-AVOutputFormat crc_muxer = {
57 
+AVOutputFormat ff_crc_muxer = {
58 58 
     "crc",
59 59 
     NULL_IF_CONFIG_SMALL("CRC testing format"),
60 60 
     NULL,
libavformat/daud.c
History View file @ c6610a2
... ... 
@@ -65,7 +65,7 @@ static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt)
65 65 
 }
66 66
67 67 
 #if CONFIG_DAUD_DEMUXER
68 
-AVInputFormat daud_demuxer = {
68 
+AVInputFormat ff_daud_demuxer = {
69 69 
     "daud",
70 70 
     NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
71 71 
     0,
... ... 
@@ -79,7 +79,7 @@ AVInputFormat daud_demuxer = {
79 79 
 #endif
80 80
81 81 
 #if CONFIG_DAUD_MUXER
82 
-AVOutputFormat daud_muxer =
82 
+AVOutputFormat ff_daud_muxer =
83 83 
 {
84 84 
     "daud",
85 85 
     NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
libavformat/diracdec.c
History View file @ c6610a2
... ... 
@@ -31,7 +31,7 @@ static int dirac_probe(AVProbeData *p)
31 31 
         return 0;
32 32 
 }
33 33
34 
-AVInputFormat dirac_demuxer = {
34 
+AVInputFormat ff_dirac_demuxer = {
35 35 
     "dirac",
36 36 
     NULL_IF_CONFIG_SMALL("raw Dirac"),
37 37 
     0,
libavformat/dnxhddec.c
History View file @ c6610a2
... ... 
@@ -42,7 +42,7 @@ static int dnxhd_probe(AVProbeData *p)
42 42 
     return AVPROBE_SCORE_MAX;
43 43 
 }
44 44
45 
-AVInputFormat dnxhd_demuxer = {
45 
+AVInputFormat ff_dnxhd_demuxer = {
46 46 
     "dnxhd",
47 47 
     NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
48 48 
     0,
libavformat/dsicin.c
History View file @ c6610a2
... ... 
@@ -216,7 +216,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
216 216 
     return 0;
217 217 
 }
218 218
219 
-AVInputFormat dsicin_demuxer = {
219 
+AVInputFormat ff_dsicin_demuxer = {
220 220 
     "dsicin",
221 221 
     NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"),
222 222 
     sizeof(CinDemuxContext),
libavformat/dtsdec.c
History View file @ c6610a2
... ... 
@@ -65,7 +65,7 @@ static int dts_probe(AVProbeData *p)
65 65 
     return 0;
66 66 
 }
67 67
68 
-AVInputFormat dts_demuxer = {
68 
+AVInputFormat ff_dts_demuxer = {
69 69 
     "dts",
70 70 
     NULL_IF_CONFIG_SMALL("raw DTS"),
71 71 
     0,
libavformat/dv.c
History View file @ c6610a2
... ... 
@@ -518,7 +518,7 @@ static int dv_probe(AVProbeData *p)
518 518 
 }
519 519
520 520 
 #if CONFIG_DV_DEMUXER
521 
-AVInputFormat dv_demuxer = {
521 
+AVInputFormat ff_dv_demuxer = {
522 522 
     "dv",
523 523 
     NULL_IF_CONFIG_SMALL("DV video format"),
524 524 
     sizeof(RawDVContext),
libavformat/dvenc.c
History View file @ c6610a2
... ... 
@@ -399,7 +399,7 @@ static int dv_write_trailer(struct AVFormatContext *s)
399 399 
     return 0;
400 400 
 }
401 401
402 
-AVOutputFormat dv_muxer = {
402 
+AVOutputFormat ff_dv_muxer = {
403 403 
     "dv",
404 404 
     NULL_IF_CONFIG_SMALL("DV video format"),
405 405 
     NULL,
libavformat/dxa.c
History View file @ c6610a2
... ... 
@@ -209,7 +209,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
209 209 
     return AVERROR(EIO);
210 210 
 }
211 211
212 
-AVInputFormat dxa_demuxer = {
212 
+AVInputFormat ff_dxa_demuxer = {
213 213 
     "dxa",
214 214 
     NULL_IF_CONFIG_SMALL("DXA"),
215 215 
     sizeof(DXAContext),
libavformat/eacdata.c
History View file @ c6610a2
... ... 
@@ -90,7 +90,7 @@ static int cdata_read_packet(AVFormatContext *s, AVPacket *pkt)
90 90 
     return 0;
91 91 
 }
92 92
93 
-AVInputFormat ea_cdata_demuxer = {
93 
+AVInputFormat ff_ea_cdata_demuxer = {
94 94 
     "ea_cdata",
95 95 
     NULL_IF_CONFIG_SMALL("Electronic Arts cdata"),
96 96 
     sizeof(CdataDemuxContext),
libavformat/electronicarts.c
History View file @ c6610a2
... ... 
@@ -568,7 +568,7 @@ get_video_packet:
568 568 
     return ret;
569 569 
 }
570 570
571 
-AVInputFormat ea_demuxer = {
571 
+AVInputFormat ff_ea_demuxer = {
572 572 
     "ea",
573 573 
     NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"),
574 574 
     sizeof(EaDemuxContext),
libavformat/ffmdec.c
History View file @ c6610a2
... ... 
@@ -518,7 +518,7 @@ static int ffm_probe(AVProbeData *p)
518 518 
     return 0;
519 519 
 }
520 520
521 
-AVInputFormat ffm_demuxer = {
521 
+AVInputFormat ff_ffm_demuxer = {
522 522 
     "ffm",
523 523 
     NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
524 524 
     sizeof(FFMContext),
libavformat/ffmenc.c
History View file @ c6610a2
... ... 
@@ -240,7 +240,7 @@ static int ffm_write_trailer(AVFormatContext *s)
240 240 
     return 0;
241 241 
 }
242 242
243 
-AVOutputFormat ffm_muxer = {
243 
+AVOutputFormat ff_ffm_muxer = {
244 244 
     "ffm",
245 245 
     NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
246 246 
     "",
libavformat/ffmetadec.c
History View file @ c6610a2
... ... 
@@ -163,7 +163,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
163 163 
     return AVERROR_EOF;
164 164 
 }
165 165
166 
-AVInputFormat ffmetadata_demuxer = {
166 
+AVInputFormat ff_ffmetadata_demuxer = {
167 167 
     .name        = "ffmetadata",
168 168 
     .long_name   = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
169 169 
     .read_probe  = probe,
libavformat/ffmetaenc.c
History View file @ c6610a2
... ... 
@@ -89,7 +89,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
89 89 
     return 0;
90 90 
 }
91 91
92 
-AVOutputFormat ffmetadata_muxer = {
92 
+AVOutputFormat ff_ffmetadata_muxer = {
93 93 
     .name          = "ffmetadata",
94 94 
     .long_name     = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
95 95 
     .extensions    = "ffmeta",
libavformat/file.c
History View file @ c6610a2
... ... 
@@ -94,7 +94,7 @@ static int file_close(URLContext *h)
94 94 
     return close(fd);
95 95 
 }
96 96
97 
-URLProtocol file_protocol = {
97 
+URLProtocol ff_file_protocol = {
98 98 
     "file",
99 99 
     file_open,
100 100 
     file_read,
... ... 
@@ -130,7 +130,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
130 130 
     return 0;
131 131 
 }
132 132
133 
-URLProtocol pipe_protocol = {
133 
+URLProtocol ff_pipe_protocol = {
134 134 
     "pipe",
135 135 
     pipe_open,
136 136 
     file_read,
libavformat/filmstripdec.c
History View file @ c6610a2
... ... 
@@ -98,7 +98,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, in
98 98 
     return 0;
99 99 
 }
100 100
101 
-AVInputFormat filmstrip_demuxer = {
101 
+AVInputFormat ff_filmstrip_demuxer = {
102 102 
     "filmstrip",
103 103 
     NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
104 104 
     sizeof(FilmstripDemuxContext),
libavformat/filmstripenc.c
History View file @ c6610a2
... ... 
@@ -71,7 +71,7 @@ static int write_trailer(AVFormatContext *s)
71 71 
     return 0;
72 72 
 }
73 73
74 
-AVOutputFormat filmstrip_muxer = {
74 
+AVOutputFormat ff_filmstrip_muxer = {
75 75 
     "filmstrip",
76 76 
     NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
77 77 
     NULL,
libavformat/flacdec.c
History View file @ c6610a2
... ... 
@@ -123,7 +123,7 @@ static int flac_probe(AVProbeData *p)
123 123 
     else                                            return AVPROBE_SCORE_MAX/2;
124 124 
 }
125 125
126 
-AVInputFormat flac_demuxer = {
126 
+AVInputFormat ff_flac_demuxer = {
127 127 
     "flac",
128 128 
     NULL_IF_CONFIG_SMALL("raw FLAC"),
129 129 
     0,
libavformat/flacenc.c
History View file @ c6610a2
... ... 
@@ -118,7 +118,7 @@ static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)
118 118 
     return 0;
119 119 
 }
120 120
121 
-AVOutputFormat flac_muxer = {
121 
+AVOutputFormat ff_flac_muxer = {
122 122 
     "flac",
123 123 
     NULL_IF_CONFIG_SMALL("raw FLAC"),
124 124 
     "audio/x-flac",
libavformat/flic.c
History View file @ c6610a2
... ... 
@@ -259,7 +259,7 @@ static int flic_read_packet(AVFormatContext *s,
259 259 
     return ret;
260 260 
 }
261 261
262 
-AVInputFormat flic_demuxer = {
262 
+AVInputFormat ff_flic_demuxer = {
263 263 
     "flic",
264 264 
     NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
265 265 
     sizeof(FlicDemuxContext),
libavformat/flvdec.c
History View file @ c6610a2
... ... 
@@ -491,7 +491,7 @@ static int flv_read_seek2(AVFormatContext *s, int stream_index,
491 491 
 }
492 492 
 #endif
493 493
494 
-AVInputFormat flv_demuxer = {
494 
+AVInputFormat ff_flv_demuxer = {
495 495 
     "flv",
496 496 
     NULL_IF_CONFIG_SMALL("FLV format"),
497 497 
     sizeof(FLVContext),
libavformat/flvenc.c
History View file @ c6610a2
... ... 
@@ -437,7 +437,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
437 437 
     return 0;
438 438 
 }
439 439
440 
-AVOutputFormat flv_muxer = {
440 
+AVOutputFormat ff_flv_muxer = {
441 441 
     "flv",
442 442 
     NULL_IF_CONFIG_SMALL("FLV format"),
443 443 
     "video/x-flv",
libavformat/framecrcenc.c
History View file @ c6610a2
... ... 
@@ -33,7 +33,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
33 33 
     return 0;
34 34 
 }
35 35
36 
-AVOutputFormat framecrc_muxer = {
36 
+AVOutputFormat ff_framecrc_muxer = {
37 37 
     "framecrc",
38 38 
     NULL_IF_CONFIG_SMALL("framecrc testing format"),
39 39 
     NULL,
libavformat/gif.c
History View file @ c6610a2
... ... 
@@ -344,7 +344,7 @@ static int gif_write_trailer(AVFormatContext *s)
344 344 
     return 0;
345 345 
 }
346 346
347 
-AVOutputFormat gif_muxer = {
347 
+AVOutputFormat ff_gif_muxer = {
348 348 
     "gif",
349 349 
     NULL_IF_CONFIG_SMALL("GIF Animation"),
350 350 
     "image/gif",
libavformat/gopher.c
History View file @ c6610a2
... ... 
@@ -119,7 +119,7 @@ static int gopher_read(URLContext *h, uint8_t *buf, int size)
119 119 
 }
120 120
121 121
122 
-URLProtocol gopher_protocol = {
122 
+URLProtocol ff_gopher_protocol = {
123 123 
     "gopher",
124 124 
     gopher_open,
125 125 
     gopher_read,
libavformat/gxf.c
History View file @ c6610a2
... ... 
@@ -515,7 +515,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index,
515 515 
     return res;
516 516 
 }
517 517
518 
-AVInputFormat gxf_demuxer = {
518 
+AVInputFormat ff_gxf_demuxer = {
519 519 
     "gxf",
520 520 
     NULL_IF_CONFIG_SMALL("GXF format"),
521 521 
     0,
libavformat/gxfenc.c
History View file @ c6610a2
... ... 
@@ -927,7 +927,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk
927 927 
                                av_interleave_packet_per_dts, gxf_compare_field_nb);
928 928 
 }
929 929
930 
-AVOutputFormat gxf_muxer = {
930 
+AVOutputFormat ff_gxf_muxer = {
931 931 
     "gxf",
932 932 
     NULL_IF_CONFIG_SMALL("GXF format"),
933 933 
     NULL,
libavformat/h261dec.c
History View file @ c6610a2
... ... 
@@ -62,7 +62,7 @@ static int h261_probe(AVProbeData *p)
62 62 
     return 0;
63 63 
 }
64 64
65 
-AVInputFormat h261_demuxer = {
65 
+AVInputFormat ff_h261_demuxer = {
66 66 
     "h261",
67 67 
     NULL_IF_CONFIG_SMALL("raw H.261"),
68 68 
     0,
libavformat/h263dec.c
History View file @ c6610a2
... ... 
@@ -64,7 +64,7 @@ static int h263_probe(AVProbeData *p)
64 64 
     return 0;
65 65 
 }
66 66
67 
-AVInputFormat h263_demuxer = {
67 
+AVInputFormat ff_h263_demuxer = {
68 68 
     "h263",
69 69 
     NULL_IF_CONFIG_SMALL("raw H.263"),
70 70 
     0,
libavformat/h264dec.c
History View file @ c6610a2
... ... 
@@ -67,7 +67,7 @@ static int h264_probe(AVProbeData *p)
67 67 
     return 0;
68 68 
 }
69 69
70 
-AVInputFormat h264_demuxer = {
70 
+AVInputFormat ff_h264_demuxer = {
71 71 
     "h264",
72 72 
     NULL_IF_CONFIG_SMALL("raw H.264 video format"),
73 73 
     0,
libavformat/http.c
History View file @ c6610a2
... ... 
@@ -503,7 +503,7 @@ http_get_file_handle(URLContext *h)
503 503 
     return url_get_file_handle(s->hd);
504 504 
 }
505 505
506 
-URLProtocol http_protocol = {
506 
+URLProtocol ff_http_protocol = {
507 507 
     "http",
508 508 
     http_open,
509 509 
     http_read,
libavformat/idcin.c
History View file @ c6610a2
... ... 
@@ -286,7 +286,7 @@ static int idcin_read_packet(AVFormatContext *s,
286 286 
     return ret;
287 287 
 }
288 288
289 
-AVInputFormat idcin_demuxer = {
289 
+AVInputFormat ff_idcin_demuxer = {
290 290 
     "idcin",
291 291 
     NULL_IF_CONFIG_SMALL("id Cinematic format"),
292 292 
     sizeof(IdcinDemuxContext),
libavformat/idroqdec.c
History View file @ c6610a2
... ... 
@@ -216,7 +216,7 @@ static int roq_read_packet(AVFormatContext *s,
216 216 
     return ret;
217 217 
 }
218 218
219 
-AVInputFormat roq_demuxer = {
219 
+AVInputFormat ff_roq_demuxer = {
220 220 
     "RoQ",
221 221 
     NULL_IF_CONFIG_SMALL("id RoQ format"),
222 222 
     sizeof(RoqDemuxContext),
libavformat/idroqenc.c
History View file @ c6610a2
... ... 
@@ -35,7 +35,7 @@ static int roq_write_header(struct AVFormatContext *s)
35 35 
     return 0;
36 36 
 }
37 37
38 
-AVOutputFormat roq_muxer =
38 
+AVOutputFormat ff_roq_muxer =
39 39 
 {
40 40 
     "RoQ",
41 41 
     NULL_IF_CONFIG_SMALL("raw id RoQ format"),
libavformat/iff.c
History View file @ c6610a2
... ... 
@@ -314,7 +314,7 @@ static int iff_read_packet(AVFormatContext *s,
314 314 
     return ret;
315 315 
 }
316 316
317 
-AVInputFormat iff_demuxer = {
317 
+AVInputFormat ff_iff_demuxer = {
318 318 
     "IFF",
319 319 
     NULL_IF_CONFIG_SMALL("IFF format"),
320 320 
     sizeof(IffDemuxContext),
libavformat/img2.c
History View file @ c6610a2
... ... 
@@ -412,7 +412,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
412 412
413 413 
 /* input */
414 414 
 #if CONFIG_IMAGE2_DEMUXER
415 
-AVInputFormat image2_demuxer = {
415 
+AVInputFormat ff_image2_demuxer = {
416 416 
     .name           = "image2",
417 417 
     .long_name      = NULL_IF_CONFIG_SMALL("image2 sequence"),
418 418 
     .priv_data_size = sizeof(VideoData),
... ... 
@@ -423,7 +423,7 @@ AVInputFormat image2_demuxer = {
423 423 
 };
424 424 
 #endif
425 425 
 #if CONFIG_IMAGE2PIPE_DEMUXER
426 
-AVInputFormat image2pipe_demuxer = {
426 
+AVInputFormat ff_image2pipe_demuxer = {
427 427 
     .name           = "image2pipe",
428 428 
     .long_name      = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
429 429 
     .priv_data_size = sizeof(VideoData),
... ... 
@@ -434,7 +434,7 @@ AVInputFormat image2pipe_demuxer = {
434 434
435 435 
 /* output */
436 436 
 #if CONFIG_IMAGE2_MUXER
437 
-AVOutputFormat image2_muxer = {
437 
+AVOutputFormat ff_image2_muxer = {
438 438 
     .name           = "image2",
439 439 
     .long_name      = NULL_IF_CONFIG_SMALL("image2 sequence"),
440 440 
     .extensions     = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
... ... 
@@ -447,7 +447,7 @@ AVOutputFormat image2_muxer = {
447 447 
 };
448 448 
 #endif
449 449 
 #if CONFIG_IMAGE2PIPE_MUXER
450 
-AVOutputFormat image2pipe_muxer = {
450 
+AVOutputFormat ff_image2pipe_muxer = {
451 451 
     .name           = "image2pipe",
452 452 
     .long_name      = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
453 453 
     .priv_data_size = sizeof(VideoData),
libavformat/ingenientdec.c
History View file @ c6610a2
... ... 
@@ -58,7 +58,7 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
58 58 
     return ret;
59 59 
 }
60 60
61 
-AVInputFormat ingenient_demuxer = {
61 
+AVInputFormat ff_ingenient_demuxer = {
62 62 
     "ingenient",
63 63 
     NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
64 64 
     0,
libavformat/ipmovie.c
History View file @ c6610a2
... ... 
@@ -620,7 +620,7 @@ static int ipmovie_read_packet(AVFormatContext *s,
620 620 
     return ret;
621 621 
 }
622 622
623 
-AVInputFormat ipmovie_demuxer = {
623 
+AVInputFormat ff_ipmovie_demuxer = {
624 624 
     "ipmovie",
625 625 
     NULL_IF_CONFIG_SMALL("Interplay MVE format"),
626 626 
     sizeof(IPMVEContext),
libavformat/iss.c
History View file @ c6610a2
... ... 
@@ -122,7 +122,7 @@ static int iss_read_packet(AVFormatContext *s, AVPacket *pkt)
122 122 
     return 0;
123 123 
 }
124 124
125 
-AVInputFormat iss_demuxer = {
125 
+AVInputFormat ff_iss_demuxer = {
126 126 
     "ISS",
127 127 
     NULL_IF_CONFIG_SMALL("Funcom ISS format"),
128 128 
     sizeof(IssDemuxContext),
libavformat/iv8.c
History View file @ c6610a2
... ... 
@@ -84,7 +84,7 @@ retry:
84 84 
     return ret;
85 85 
 }
86 86
87 
-AVInputFormat iv8_demuxer = {
87 
+AVInputFormat ff_iv8_demuxer = {
88 88 
     "iv8",
89 89 
     NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server"),
90 90 
     0,
libavformat/ivfdec.c
History View file @ c6610a2
... ... 
@@ -79,7 +79,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
79 79 
     return ret;
80 80 
 }
81 81
82 
-AVInputFormat ivf_demuxer = {
82 
+AVInputFormat ff_ivf_demuxer = {
83 83 
     "ivf",
84 84 
     NULL_IF_CONFIG_SMALL("On2 IVF"),
85 85 
     0,
libavformat/ivfenc.c
History View file @ c6610a2
... ... 
@@ -58,7 +58,7 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt)
58 58 
     return 0;
59 59 
 }
60 60
61 
-AVOutputFormat ivf_muxer = {
61 
+AVOutputFormat ff_ivf_muxer = {
62 62 
     .name = "ivf",
63 63 
     .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
64 64 
     .extensions = "ivf",
libavformat/libnut.c
History View file @ c6610a2
... ... 
@@ -150,7 +150,7 @@ static int nut_write_trailer(AVFormatContext * avf) {
150 150 
     return 0;
151 151 
 }
152 152
153 
-AVOutputFormat libnut_muxer = {
153 
+AVOutputFormat ff_libnut_muxer = {
154 154 
     "libnut",
155 155 
     "nut format",
156 156 
     "video/x-nut",
... ... 
@@ -297,7 +297,7 @@ static int nut_read_close(AVFormatContext *s) {
297 297 
     return 0;
298 298 
 }
299 299
300 
-AVInputFormat libnut_demuxer = {
300 
+AVInputFormat ff_libnut_demuxer = {
301 301 
     "libnut",
302 302 
     NULL_IF_CONFIG_SMALL("NUT format"),
303 303 
     sizeof(NUTContext),
libavformat/librtmp.c
History View file @ c6610a2
... ... 
@@ -157,7 +157,7 @@ static int rtmp_get_file_handle(URLContext *s)
157 157 
     return RTMP_Socket(r);
158 158 
 }
159 159
160 
-URLProtocol rtmp_protocol = {
160 
+URLProtocol ff_rtmp_protocol = {
161 161 
     "rtmp",
162 162 
     rtmp_open,
163 163 
     rtmp_read,
... ... 
@@ -170,7 +170,7 @@ URLProtocol rtmp_protocol = {
170 170 
     rtmp_get_file_handle
171 171 
 };
172 172
173 
-URLProtocol rtmpt_protocol = {
173 
+URLProtocol ff_rtmpt_protocol = {
174 174 
     "rtmpt",
175 175 
     rtmp_open,
176 176 
     rtmp_read,
... ... 
@@ -183,7 +183,7 @@ URLProtocol rtmpt_protocol = {
183 183 
     rtmp_get_file_handle
184 184 
 };
185 185
186 
-URLProtocol rtmpe_protocol = {
186 
+URLProtocol ff_rtmpe_protocol = {
187 187 
     "rtmpe",
188 188 
     rtmp_open,
189 189 
     rtmp_read,
... ... 
@@ -196,7 +196,7 @@ URLProtocol rtmpe_protocol = {
196 196 
     rtmp_get_file_handle
197 197 
 };
198 198
199 
-URLProtocol rtmpte_protocol = {
199 
+URLProtocol ff_rtmpte_protocol = {
200 200 
     "rtmpte",
201 201 
     rtmp_open,
202 202 
     rtmp_read,
... ... 
@@ -209,7 +209,7 @@ URLProtocol rtmpte_protocol = {
209 209 
     rtmp_get_file_handle
210 210 
 };
211 211
212 
-URLProtocol rtmps_protocol = {
212 
+URLProtocol ff_rtmps_protocol = {
213 213 
     "rtmps",
214 214 
     rtmp_open,
215 215 
     rtmp_read,
libavformat/lmlm4.c
History View file @ c6610a2
... ... 
@@ -117,7 +117,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) {
117 117 
     return ret;
118 118 
 }
119 119
120 
-AVInputFormat lmlm4_demuxer = {
120 
+AVInputFormat ff_lmlm4_demuxer = {
121 121 
     "lmlm4",
122 122 
     NULL_IF_CONFIG_SMALL("lmlm4 raw format"),
123 123 
     0,
libavformat/lxfdec.c
History View file @ c6610a2
... ... 
@@ -336,7 +336,7 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt)
336 336 
     return ret;
337 337 
 }
338 338
339 
-AVInputFormat lxf_demuxer = {
339 
+AVInputFormat ff_lxf_demuxer = {
340 340 
     .name           = "lxf",
341 341 
     .long_name      = NULL_IF_CONFIG_SMALL("VR native stream format (LXF)"),
342 342 
     .priv_data_size = sizeof(LXFDemuxContext),
libavformat/m4vdec.c
History View file @ c6610a2
... ... 
@@ -49,7 +49,7 @@ static int mpeg4video_probe(AVProbeData *probe_packet)
49 49 
     return 0;
50 50 
 }
51 51
52 
-AVInputFormat m4v_demuxer = {
52 
+AVInputFormat ff_m4v_demuxer = {
53 53 
     "m4v",
54 54 
     NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
55 55 
     0,
libavformat/matroskadec.c
History View file @ c6610a2
... ... 
@@ -1920,7 +1920,7 @@ static int matroska_read_close(AVFormatContext *s)
1920 1920 
     return 0;
1921 1921 
 }
1922 1922
1923 
-AVInputFormat matroska_demuxer = {
1923 
+AVInputFormat ff_matroska_demuxer = {
1924 1924 
     "matroska,webm",
1925 1925 
     NULL_IF_CONFIG_SMALL("Matroska/WebM file format"),
1926 1926 
     sizeof(MatroskaDemuxContext),
libavformat/matroskaenc.c
History View file @ c6610a2
... ... 
@@ -1177,7 +1177,7 @@ static int mkv_write_trailer(AVFormatContext *s)
1177 1177 
 }
1178 1178
1179 1179 
 #if CONFIG_MATROSKA_MUXER
1180 
-AVOutputFormat matroska_muxer = {
1180 
+AVOutputFormat ff_matroska_muxer = {
1181 1181 
     "matroska",
1182 1182 
     NULL_IF_CONFIG_SMALL("Matroska file format"),
1183 1183 
     "video/x-matroska",
... ... 
@@ -1195,7 +1195,7 @@ AVOutputFormat matroska_muxer = {
1195 1195 
 #endif
1196 1196
1197 1197 
 #if CONFIG_WEBM_MUXER
1198 
-AVOutputFormat webm_muxer = {
1198 
+AVOutputFormat ff_webm_muxer = {
1199 1199 
     "webm",
1200 1200 
     NULL_IF_CONFIG_SMALL("WebM file format"),
1201 1201 
     "video/webm",
... ... 
@@ -1211,7 +1211,7 @@ AVOutputFormat webm_muxer = {
1211 1211 
 #endif
1212 1212
1213 1213 
 #if CONFIG_MATROSKA_AUDIO_MUXER
1214 
-AVOutputFormat matroska_audio_muxer = {
1214 
+AVOutputFormat ff_matroska_audio_muxer = {
1215 1215 
     "matroska",
1216 1216 
     NULL_IF_CONFIG_SMALL("Matroska file format"),
1217 1217 
     "audio/x-matroska",
libavformat/md5enc.c
History View file @ c6610a2
... ... 
@@ -65,7 +65,7 @@ static int write_trailer(struct AVFormatContext *s)
65 65 
     return 0;
66 66 
 }
67 67
68 
-AVOutputFormat md5_muxer = {
68 
+AVOutputFormat ff_md5_muxer = {
69 69 
     "md5",
70 70 
     NULL_IF_CONFIG_SMALL("MD5 testing format"),
71 71 
     NULL,
... ... 
@@ -95,7 +95,7 @@ static int framemd5_write_packet(struct AVFormatContext *s, AVPacket *pkt)
95 95 
     return 0;
96 96 
 }
97 97
98 
-AVOutputFormat framemd5_muxer = {
98 
+AVOutputFormat ff_framemd5_muxer = {
99 99 
     "framemd5",
100 100 
     NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"),
101 101 
     NULL,
libavformat/md5proto.c
History View file @ c6610a2
... ... 
@@ -82,7 +82,7 @@ static int md5_get_handle(URLContext *h)
82 82 
     return (intptr_t)h->priv_data;
83 83 
 }
84 84
85 
-URLProtocol md5_protocol = {
85 
+URLProtocol ff_md5_protocol = {
86 86 
     .name                = "md5",
87 87 
     .url_open            = md5_open,
88 88 
     .url_write           = md5_write,
libavformat/mm.c
History View file @ c6610a2
... ... 
@@ -188,7 +188,7 @@ static int read_packet(AVFormatContext *s,
188 188 
     return 0;
189 189 
 }
190 190
191 
-AVInputFormat mm_demuxer = {
191 
+AVInputFormat ff_mm_demuxer = {
192 192 
     "mm",
193 193 
     NULL_IF_CONFIG_SMALL("American Laser Games MM format"),
194 194 
     sizeof(MmDemuxContext),
libavformat/mmf.c
History View file @ c6610a2
... ... 
@@ -291,7 +291,7 @@ static int mmf_read_packet(AVFormatContext *s,
291 291 
 }
292 292
293 293 
 #if CONFIG_MMF_DEMUXER
294 
-AVInputFormat mmf_demuxer = {
294 
+AVInputFormat ff_mmf_demuxer = {
295 295 
     "mmf",
296 296 
     NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
297 297 
     sizeof(MMFContext),
... ... 
@@ -303,7 +303,7 @@ AVInputFormat mmf_demuxer = {
303 303 
 };
304 304 
 #endif
305 305 
 #if CONFIG_MMF_MUXER
306 
-AVOutputFormat mmf_muxer = {
306 
+AVOutputFormat ff_mmf_muxer = {
307 307 
     "mmf",
308 308 
     NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
309 309 
     "application/vnd.smaf",
libavformat/mmsh.c
History View file @ c6610a2
... ... 
@@ -359,7 +359,7 @@ static int mmsh_read(URLContext *h, uint8_t *buf, int size)
359 359 
     return res;
360 360 
 }
361 361
362 
-URLProtocol mmsh_protocol = {
362 
+URLProtocol ff_mmsh_protocol = {
363 363 
     .name      = "mmsh",
364 364 
     .url_open  = mmsh_open,
365 365 
     .url_read  = mmsh_read,
libavformat/mmst.c
History View file @ c6610a2
... ... 
@@ -621,7 +621,7 @@ static int mms_read(URLContext *h, uint8_t *buf, int size)
621 621 
     return result;
622 622 
 }
623 623
624 
-URLProtocol mmst_protocol = {
624 
+URLProtocol ff_mmst_protocol = {
625 625 
     "mmst",
626 626 
     mms_open,
627 627 
     mms_read,
libavformat/mov.c
History View file @ c6610a2
... ... 
@@ -2561,7 +2561,7 @@ static int mov_read_close(AVFormatContext *s)
2561 2561 
     return 0;
2562 2562 
 }
2563 2563
2564 
-AVInputFormat mov_demuxer = {
2564 
+AVInputFormat ff_mov_demuxer = {
2565 2565 
     "mov,mp4,m4a,3gp,3g2,mj2",
2566 2566 
     NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"),
2567 2567 
     sizeof(MOVContext),
libavformat/movenc.c
History View file @ c6610a2
... ... 
@@ -2205,7 +2205,7 @@ static int mov_write_trailer(AVFormatContext *s)
2205 2205 
 }
2206 2206
2207 2207 
 #if CONFIG_MOV_MUXER
2208 
-AVOutputFormat mov_muxer = {
2208 
+AVOutputFormat ff_mov_muxer = {
2209 2209 
     "mov",
2210 2210 
     NULL_IF_CONFIG_SMALL("MOV format"),
2211 2211 
     NULL,
... ... 
@@ -2221,7 +2221,7 @@ AVOutputFormat mov_muxer = {
2221 2221 
 };
2222 2222 
 #endif
2223 2223 
 #if CONFIG_TGP_MUXER
2224 
-AVOutputFormat tgp_muxer = {
2224 
+AVOutputFormat ff_tgp_muxer = {
2225 2225 
     "3gp",
2226 2226 
     NULL_IF_CONFIG_SMALL("3GP format"),
2227 2227 
     NULL,
... ... 
@@ -2237,7 +2237,7 @@ AVOutputFormat tgp_muxer = {
2237 2237 
 };
2238 2238 
 #endif
2239 2239 
 #if CONFIG_MP4_MUXER
2240 
-AVOutputFormat mp4_muxer = {
2240 
+AVOutputFormat ff_mp4_muxer = {
2241 2241 
     "mp4",
2242 2242 
     NULL_IF_CONFIG_SMALL("MP4 format"),
2243 2243 
     "application/mp4",
... ... 
@@ -2253,7 +2253,7 @@ AVOutputFormat mp4_muxer = {
2253 2253 
 };
2254 2254 
 #endif
2255 2255 
 #if CONFIG_PSP_MUXER
2256 
-AVOutputFormat psp_muxer = {
2256 
+AVOutputFormat ff_psp_muxer = {
2257 2257 
     "psp",
2258 2258 
     NULL_IF_CONFIG_SMALL("PSP MP4 format"),
2259 2259 
     NULL,
... ... 
@@ -2269,7 +2269,7 @@ AVOutputFormat psp_muxer = {
2269 2269 
 };
2270 2270 
 #endif
2271 2271 
 #if CONFIG_TG2_MUXER
2272 
-AVOutputFormat tg2_muxer = {
2272 
+AVOutputFormat ff_tg2_muxer = {
2273 2273 
     "3g2",
2274 2274 
     NULL_IF_CONFIG_SMALL("3GP2 format"),
2275 2275 
     NULL,
... ... 
@@ -2285,7 +2285,7 @@ AVOutputFormat tg2_muxer = {
2285 2285 
 };
2286 2286 
 #endif
2287 2287 
 #if CONFIG_IPOD_MUXER
2288 
-AVOutputFormat ipod_muxer = {
2288 
+AVOutputFormat ff_ipod_muxer = {
2289 2289 
     "ipod",
2290 2290 
     NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"),
2291 2291 
     "application/mp4",
libavformat/mp3dec.c
History View file @ c6610a2
... ... 
@@ -185,7 +185,7 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
185 185 
     return ret;
186 186 
 }
187 187
188 
-AVInputFormat mp3_demuxer = {
188 
+AVInputFormat ff_mp3_demuxer = {
189 189 
     "mp3",
190 190 
     NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"),
191 191 
     0,
libavformat/mp3enc.c
History View file @ c6610a2
... ... 
@@ -134,7 +134,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)
134 134 
 }
135 135
136 136 
 #if CONFIG_MP2_MUXER
137 
-AVOutputFormat mp2_muxer = {
137 
+AVOutputFormat ff_mp2_muxer = {
138 138 
     "mp2",
139 139 
     NULL_IF_CONFIG_SMALL("MPEG audio layer 2"),
140 140 
     "audio/x-mpeg",
... ... 
@@ -233,7 +233,7 @@ static int mp3_write_header(struct AVFormatContext *s)
233 233 
     return 0;
234 234 
 }
235 235
236 
-AVOutputFormat mp3_muxer = {
236 
+AVOutputFormat ff_mp3_muxer = {
237 237 
     "mp3",
238 238 
     NULL_IF_CONFIG_SMALL("MPEG audio layer 3"),
239 239 
     "audio/x-mpeg",
libavformat/mpc.c
History View file @ c6610a2
... ... 
@@ -212,7 +212,7 @@ static int mpc_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
212 212 
 }
213 213
214 214
215 
-AVInputFormat mpc_demuxer = {
215 
+AVInputFormat ff_mpc_demuxer = {
216 216 
     "mpc",
217 217 
     NULL_IF_CONFIG_SMALL("Musepack"),
218 218 
     sizeof(MPCContext),
libavformat/mpc8.c
History View file @ c6610a2
... ... 
@@ -279,7 +279,7 @@ static int mpc8_read_seek(AVFormatContext *s, int stream_index, int64_t timestam
279 279 
 }
280 280
281 281
282 
-AVInputFormat mpc8_demuxer = {
282 
+AVInputFormat ff_mpc8_demuxer = {
283 283 
     "mpc8",
284 284 
     NULL_IF_CONFIG_SMALL("Musepack SV8"),
285 285 
     sizeof(MPCContext),
libavformat/mpeg.c
History View file @ c6610a2
... ... 
@@ -610,7 +610,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
610 610 
     return dts;
611 611 
 }
612 612
613 
-AVInputFormat mpegps_demuxer = {
613 
+AVInputFormat ff_mpegps_demuxer = {
614 614 
     "mpeg",
615 615 
     NULL_IF_CONFIG_SMALL("MPEG-PS format"),
616 616 
     sizeof(MpegDemuxContext),
libavformat/mpegenc.c
History View file @ c6610a2
... ... 
@@ -76,10 +76,10 @@ typedef struct {
76 76
77 77 
 } MpegMuxContext;
78 78
79 
-extern AVOutputFormat mpeg1vcd_muxer;
80 
-extern AVOutputFormat mpeg2dvd_muxer;
81 
-extern AVOutputFormat mpeg2svcd_muxer;
82 
-extern AVOutputFormat mpeg2vob_muxer;
79 
+extern AVOutputFormat ff_mpeg1vcd_muxer;
80 
+extern AVOutputFormat ff_mpeg2dvd_muxer;
81 
+extern AVOutputFormat ff_mpeg2svcd_muxer;
82 
+extern AVOutputFormat ff_mpeg2vob_muxer;
83 83
84 84 
 static int put_pack_header(AVFormatContext *ctx,
85 85 
                            uint8_t *buf, int64_t timestamp)
... ... 
@@ -297,12 +297,12 @@ static int mpeg_mux_init(AVFormatContext *ctx)
297 297 
     int video_bitrate;
298 298
299 299 
     s->packet_number = 0;
300 
-    s->is_vcd =    (CONFIG_MPEG1VCD_MUXER  && ctx->oformat == &mpeg1vcd_muxer);
301 
-    s->is_svcd =   (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer);
302 
-    s->is_mpeg2 = ((CONFIG_MPEG2VOB_MUXER  && ctx->oformat == &mpeg2vob_muxer) ||
303 
-                   (CONFIG_MPEG2DVD_MUXER  && ctx->oformat == &mpeg2dvd_muxer) ||
304 
-                   (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer));
305 
-    s->is_dvd =    (CONFIG_MPEG2DVD_MUXER  && ctx->oformat == &mpeg2dvd_muxer);
300 
+    s->is_vcd =    (CONFIG_MPEG1VCD_MUXER  && ctx->oformat == &ff_mpeg1vcd_muxer);
301 
+    s->is_svcd =   (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &ff_mpeg2svcd_muxer);
302 
+    s->is_mpeg2 = ((CONFIG_MPEG2VOB_MUXER  && ctx->oformat == &ff_mpeg2vob_muxer) ||
303 
+                   (CONFIG_MPEG2DVD_MUXER  && ctx->oformat == &ff_mpeg2dvd_muxer) ||
304 
+                   (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &ff_mpeg2svcd_muxer));
305 
+    s->is_dvd =    (CONFIG_MPEG2DVD_MUXER  && ctx->oformat == &ff_mpeg2dvd_muxer);
306 306
307 307 
     if(ctx->packet_size) {
308 308 
         if (ctx->packet_size < 20 || ctx->packet_size > (1 << 23) + 10) {
... ... 
@@ -1233,7 +1233,7 @@ static int mpeg_mux_end(AVFormatContext *ctx)
1233 1233 
 }
1234 1234
1235 1235 
 #if CONFIG_MPEG1SYSTEM_MUXER
1236 
-AVOutputFormat mpeg1system_muxer = {
1236 
+AVOutputFormat ff_mpeg1system_muxer = {
1237 1237 
     "mpeg",
1238 1238 
     NULL_IF_CONFIG_SMALL("MPEG-1 System format"),
1239 1239 
     "video/mpeg",
... ... 
@@ -1247,7 +1247,7 @@ AVOutputFormat mpeg1system_muxer = {
1247 1247 
 };
1248 1248 
 #endif
1249 1249 
 #if CONFIG_MPEG1VCD_MUXER
1250 
-AVOutputFormat mpeg1vcd_muxer = {
1250 
+AVOutputFormat ff_mpeg1vcd_muxer = {
1251 1251 
     "vcd",
1252 1252 
     NULL_IF_CONFIG_SMALL("MPEG-1 System format (VCD)"),
1253 1253 
     "video/mpeg",
... ... 
@@ -1261,7 +1261,7 @@ AVOutputFormat mpeg1vcd_muxer = {
1261 1261 
 };
1262 1262 
 #endif
1263 1263 
 #if CONFIG_MPEG2VOB_MUXER
1264 
-AVOutputFormat mpeg2vob_muxer = {
1264 
+AVOutputFormat ff_mpeg2vob_muxer = {
1265 1265 
     "vob",
1266 1266 
     NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),
1267 1267 
     "video/mpeg",
... ... 
@@ -1277,7 +1277,7 @@ AVOutputFormat mpeg2vob_muxer = {
1277 1277
1278 1278 
 /* Same as mpeg2vob_mux except that the pack size is 2324 */
1279 1279 
 #if CONFIG_MPEG2SVCD_MUXER
1280 
-AVOutputFormat mpeg2svcd_muxer = {
1280 
+AVOutputFormat ff_mpeg2svcd_muxer = {
1281 1281 
     "svcd",
1282 1282 
     NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),
1283 1283 
     "video/mpeg",
... ... 
@@ -1293,7 +1293,7 @@ AVOutputFormat mpeg2svcd_muxer = {
1293 1293
1294 1294 
 /*  Same as mpeg2vob_mux except the 'is_dvd' flag is set to produce NAV pkts */
1295 1295 
 #if CONFIG_MPEG2DVD_MUXER
1296 
-AVOutputFormat mpeg2dvd_muxer = {
1296 
+AVOutputFormat ff_mpeg2dvd_muxer = {
1297 1297 
     "dvd",
1298 1298 
     NULL_IF_CONFIG_SMALL("MPEG-2 PS format (DVD VOB)"),
1299 1299 
     "video/mpeg",
libavformat/mpegts.c
History View file @ c6610a2
... ... 
@@ -158,7 +158,7 @@ typedef struct PESContext {
158 158 
     uint8_t *buffer;
159 159 
 } PESContext;
160 160
161 
-extern AVInputFormat mpegts_demuxer;
161 
+extern AVInputFormat ff_mpegts_demuxer;
162 162
163 163 
 static void clear_program(MpegTSContext *ts, unsigned int programid)
164 164 
 {
... ... 
@@ -1468,7 +1468,7 @@ static int mpegts_read_header(AVFormatContext *s,
1468 1468 
     ts->stream = s;
1469 1469 
     ts->auto_guess = 0;
1470 1470
1471 
-    if (s->iformat == &mpegts_demuxer) {
1471 
+    if (s->iformat == &ff_mpegts_demuxer) {
1472 1472 
         /* normal demux */
1473 1473
1474 1474 
         /* first do a scaning to get all the services */
... ... 
@@ -1845,7 +1845,7 @@ void ff_mpegts_parse_close(MpegTSContext *ts)
1845 1845 
     av_free(ts);
1846 1846 
 }
1847 1847
1848 
-AVInputFormat mpegts_demuxer = {
1848 
+AVInputFormat ff_mpegts_demuxer = {
1849 1849 
     "mpegts",
1850 1850 
     NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
1851 1851 
     sizeof(MpegTSContext),
... ... 
@@ -1861,7 +1861,7 @@ AVInputFormat mpegts_demuxer = {
1861 1861 
 #endif
1862 1862 
 };
1863 1863
1864 
-AVInputFormat mpegtsraw_demuxer = {
1864 
+AVInputFormat ff_mpegtsraw_demuxer = {
1865 1865 
     "mpegtsraw",
1866 1866 
     NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"),
1867 1867 
     sizeof(MpegTSContext),
libavformat/mpegtsenc.c
History View file @ c6610a2
... ... 
@@ -948,7 +948,7 @@ static int mpegts_write_end(AVFormatContext *s)
948 948 
     return 0;
949 949 
 }
950 950
951 
-AVOutputFormat mpegts_muxer = {
951 
+AVOutputFormat ff_mpegts_muxer = {
952 952 
     "mpegts",
953 953 
     NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
954 954 
     "video/x-mpegts",
libavformat/mpegvideodec.c
History View file @ c6610a2
... ... 
@@ -55,7 +55,7 @@ static int mpegvideo_probe(AVProbeData *p)
55 55 
     return 0;
56 56 
 }
57 57
58 
-AVInputFormat mpegvideo_demuxer = {
58 
+AVInputFormat ff_mpegvideo_demuxer = {
59 59 
     "mpegvideo",
60 60 
     NULL_IF_CONFIG_SMALL("raw MPEG video"),
61 61 
     0,
libavformat/mpjpeg.c
History View file @ c6610a2
... ... 
@@ -53,7 +53,7 @@ static int mpjpeg_write_trailer(AVFormatContext *s)
53 53 
     return 0;
54 54 
 }
55 55
56 
-AVOutputFormat mpjpeg_muxer = {
56 
+AVOutputFormat ff_mpjpeg_muxer = {
57 57 
     "mpjpeg",
58 58 
     NULL_IF_CONFIG_SMALL("MIME multipart JPEG format"),
59 59 
     "multipart/x-mixed-replace;boundary=" BOUNDARY_TAG,
libavformat/msnwc_tcp.c
History View file @ c6610a2
... ... 
@@ -130,7 +130,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
130 130 
     return HEADER_SIZE + size;
131 131 
 }
132 132
133 
-AVInputFormat msnwc_tcp_demuxer = {
133 
+AVInputFormat ff_msnwc_tcp_demuxer = {
134 134 
     "msnwctcp",
135 135 
     NULL_IF_CONFIG_SMALL("MSN TCP Webcam stream"),
136 136 
     0,
libavformat/mtv.c
History View file @ c6610a2
... ... 
@@ -196,7 +196,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
196 196 
     return ret;
197 197 
 }
198 198
199 
-AVInputFormat mtv_demuxer = {
199 
+AVInputFormat ff_mtv_demuxer = {
200 200 
     "MTV",
201 201 
     NULL_IF_CONFIG_SMALL("MTV format"),
202 202 
     sizeof(MTVDemuxContext),
libavformat/mvi.c
History View file @ c6610a2
... ... 
@@ -123,7 +123,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
123 123 
     return 0;
124 124 
 }
125 125
126 
-AVInputFormat mvi_demuxer = {
126 
+AVInputFormat ff_mvi_demuxer = {
127 127 
     "mvi",
128 128 
     NULL_IF_CONFIG_SMALL("Motion Pixels MVI format"),
129 129 
     sizeof(MviDemuxContext),
libavformat/mxfdec.c
History View file @ c6610a2
... ... 
@@ -1014,7 +1014,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
1014 1014 
     return 0;
1015 1015 
 }
1016 1016
1017 
-AVInputFormat mxf_demuxer = {
1017 
+AVInputFormat ff_mxf_demuxer = {
1018 1018 
     "mxf",
1019 1019 
     NULL_IF_CONFIG_SMALL("Material eXchange Format"),
1020 1020 
     sizeof(MXFContext),
libavformat/mxfenc.c
History View file @ c6610a2
... ... 
@@ -44,7 +44,7 @@
44 44 
 static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 };
45 45 
 static const int PAL_samples_per_frame[]  = { 1920, 0 };
46 46
47 
-extern AVOutputFormat mxf_d10_muxer;
47 
+extern AVOutputFormat ff_mxf_d10_muxer;
48 48
49 49 
 #define EDIT_UNITS_PER_BODY 250
50 50 
 #define KAG_SIZE 512
... ... 
@@ -1371,7 +1371,7 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st,
1371 1371 
             }
1372 1372 
         }
1373 1373 
     }
1374 
-    if (s->oformat != &mxf_d10_muxer)
1374 
+    if (s->oformat != &ff_mxf_d10_muxer)
1375 1375 
         sc->codec_ul = mxf_get_mpeg2_codec_ul(st->codec);
1376 1376 
     return !!sc->codec_ul;
1377 1377 
 }
... ... 
@@ -1436,7 +1436,7 @@ static int mxf_write_header(AVFormatContext *s)
1436 1436 
                 return -1;
1437 1437 
             }
1438 1438 
             av_set_pts_info(st, 64, mxf->time_base.num, mxf->time_base.den);
1439 
-            if (s->oformat == &mxf_d10_muxer) {
1439 
+            if (s->oformat == &ff_mxf_d10_muxer) {
1440 1440 
                 if (st->codec->bit_rate == 50000000)
1441 1441 
                     if (mxf->time_base.den == 25) sc->index = 3;
1442 1442 
                     else                          sc->index = 5;
... ... 
@@ -1464,7 +1464,7 @@ static int mxf_write_header(AVFormatContext *s)
1464 1464 
                 return -1;
1465 1465 
             }
1466 1466 
             av_set_pts_info(st, 64, 1, st->codec->sample_rate);
1467 
-            if (s->oformat == &mxf_d10_muxer) {
1467 
+            if (s->oformat == &ff_mxf_d10_muxer) {
1468 1468 
                 if (st->index != 1) {
1469 1469 
                     av_log(s, AV_LOG_ERROR, "MXF D-10 only support one audio track\n");
1470 1470 
                     return -1;
... ... 
@@ -1498,7 +1498,7 @@ static int mxf_write_header(AVFormatContext *s)
1498 1498 
         present[sc->index]++;
1499 1499 
     }
1500 1500
1501 
-    if (s->oformat == &mxf_d10_muxer) {
1501 
+    if (s->oformat == &ff_mxf_d10_muxer) {
1502 1502 
         mxf->essence_container_count = 1;
1503 1503 
     }
1504 1504
... ... 
@@ -1720,7 +1720,7 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt)
1720 1720
1721 1721 
     mxf_write_klv_fill(s);
1722 1722 
     put_buffer(pb, sc->track_essence_element_key, 16); // write key
1723 
-    if (s->oformat == &mxf_d10_muxer) {
1723 
+    if (s->oformat == &ff_mxf_d10_muxer) {
1724 1724 
         if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
1725 1725 
             mxf_write_d10_video_packet(s, st, pkt);
1726 1726 
         else
... ... 
@@ -1879,7 +1879,7 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int
1879 1879 
                                mxf_interleave_get_packet, mxf_compare_timestamps);
1880 1880 
 }
1881 1881
1882 
-AVOutputFormat mxf_muxer = {
1882 
+AVOutputFormat ff_mxf_muxer = {
1883 1883 
     "mxf",
1884 1884 
     NULL_IF_CONFIG_SMALL("Material eXchange Format"),
1885 1885 
     "application/mxf",
... ... 
@@ -1895,7 +1895,7 @@ AVOutputFormat mxf_muxer = {
1895 1895 
     mxf_interleave,
1896 1896 
 };
1897 1897
1898 
-AVOutputFormat mxf_d10_muxer = {
1898 
+AVOutputFormat ff_mxf_d10_muxer = {
1899 1899 
     "mxf_d10",
1900 1900 
     NULL_IF_CONFIG_SMALL("Material eXchange Format, D-10 Mapping"),
1901 1901 
     "application/mxf",
libavformat/mxg.c
History View file @ c6610a2
... ... 
@@ -240,7 +240,7 @@ static int mxg_close(struct AVFormatContext *s)
240 240 
     return 0;
241 241 
 }
242 242
243 
-AVInputFormat mxg_demuxer = {
243 
+AVInputFormat ff_mxg_demuxer = {
244 244 
     .name = "mxg",
245 245 
     .long_name = NULL_IF_CONFIG_SMALL("MxPEG clip file format"),
246 246 
     .priv_data_size = sizeof(MXGContext),
libavformat/ncdec.c
History View file @ c6610a2
... ... 
@@ -90,7 +90,7 @@ static int nc_read_packet(AVFormatContext *s, AVPacket *pkt)
90 90 
     return size;
91 91 
 }
92 92
93 
-AVInputFormat nc_demuxer = {
93 
+AVInputFormat ff_nc_demuxer = {
94 94 
     "nc",
95 95 
     NULL_IF_CONFIG_SMALL("NC camera feed format"),
96 96 
     0,
libavformat/nsvdec.c
History View file @ c6610a2
... ... 
@@ -774,7 +774,7 @@ static int nsv_probe(AVProbeData *p)
774 774 
     return 0;
775 775 
 }
776 776
777 
-AVInputFormat nsv_demuxer = {
777 
+AVInputFormat ff_nsv_demuxer = {
778 778 
     "nsv",
779 779 
     NULL_IF_CONFIG_SMALL("Nullsoft Streaming Video"),
780 780 
     sizeof(NSVContext),
libavformat/nullenc.c
History View file @ c6610a2
... ... 
@@ -26,7 +26,7 @@ static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
26 26 
     return 0;
27 27 
 }
28 28
29 
-AVOutputFormat null_muxer = {
29 
+AVOutputFormat ff_null_muxer = {
30 30 
     "null",
31 31 
     NULL_IF_CONFIG_SMALL("raw null video format"),
32 32 
     NULL,
libavformat/nutdec.c
History View file @ c6610a2
... ... 
@@ -926,7 +926,7 @@ static int nut_read_close(AVFormatContext *s)
926 926 
 }
927 927
928 928 
 #if CONFIG_NUT_DEMUXER
929 
-AVInputFormat nut_demuxer = {
929 
+AVInputFormat ff_nut_demuxer = {
930 930 
     "nut",
931 931 
     NULL_IF_CONFIG_SMALL("NUT format"),
932 932 
     sizeof(NUTContext),
libavformat/nutenc.c
History View file @ c6610a2
... ... 
@@ -793,7 +793,7 @@ static int write_trailer(AVFormatContext *s){
793 793 
     return 0;
794 794 
 }
795 795
796 
-AVOutputFormat nut_muxer = {
796 
+AVOutputFormat ff_nut_muxer = {
797 797 
     "nut",
798 798 
     NULL_IF_CONFIG_SMALL("NUT format"),
799 799 
     "video/x-nut",
libavformat/nuv.c
History View file @ c6610a2
... ... 
@@ -257,7 +257,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
257 257 
     return AVERROR(EIO);
258 258 
 }
259 259
260 
-AVInputFormat nuv_demuxer = {
260 
+AVInputFormat ff_nuv_demuxer = {
261 261 
     "nuv",
262 262 
     NULL_IF_CONFIG_SMALL("NuppelVideo format"),
263 263 
     sizeof(NUVContext),
libavformat/oggdec.c
History View file @ c6610a2
... ... 
@@ -648,7 +648,7 @@ static int ogg_probe(AVProbeData *p)
648 648 
         return 0;
649 649 
 }
650 650
651 
-AVInputFormat ogg_demuxer = {
651 
+AVInputFormat ff_ogg_demuxer = {
652 652 
     "ogg",
653 653 
     NULL_IF_CONFIG_SMALL("Ogg"),
654 654 
     sizeof (struct ogg),
libavformat/oggenc.c
History View file @ c6610a2
... ... 
@@ -502,7 +502,7 @@ static int ogg_write_trailer(AVFormatContext *s)
502 502 
     return 0;
503 503 
 }
504 504
505 
-AVOutputFormat ogg_muxer = {
505 
+AVOutputFormat ff_ogg_muxer = {
506 506 
     "ogg",
507 507 
     NULL_IF_CONFIG_SMALL("Ogg"),
508 508 
     "application/ogg",
libavformat/oma.c
History View file @ c6610a2
... ... 
@@ -189,7 +189,7 @@ static int oma_read_probe(AVProbeData *p)
189 189 
 }
190 190
191 191
192 
-AVInputFormat oma_demuxer = {
192 
+AVInputFormat ff_oma_demuxer = {
193 193 
     "oma",
194 194 
     NULL_IF_CONFIG_SMALL("Sony OpenMG audio"),
195 195 
     0,
libavformat/pcmdec.c
History View file @ c6610a2
... ... 
@@ -47,7 +47,7 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
47 47 
 }
48 48
49 49 
 #define PCMDEF(name, long_name, ext, codec) \
50 
-AVInputFormat pcm_ ## name ## _demuxer = {\
50 
+AVInputFormat ff_pcm_ ## name ## _demuxer = {\
51 51 
     #name,\
52 52 
     NULL_IF_CONFIG_SMALL(long_name),\
53 53 
     0,\
libavformat/pcmenc.c
History View file @ c6610a2
... ... 
@@ -23,7 +23,7 @@
23 23 
 #include "rawenc.h"
24 24
25 25 
 #define PCMDEF(name, long_name, ext, codec) \
26 
-AVOutputFormat pcm_ ## name ## _muxer = {\
26 
+AVOutputFormat ff_pcm_ ## name ## _muxer = {\
27 27 
     #name,\
28 28 
     NULL_IF_CONFIG_SMALL(long_name),\
29 29 
     NULL,\
libavformat/psxstr.c
History View file @ c6610a2
... ... 
@@ -258,7 +258,7 @@ static int str_read_close(AVFormatContext *s)
258 258 
     return 0;
259 259 
 }
260 260
261 
-AVInputFormat str_demuxer = {
261 
+AVInputFormat ff_str_demuxer = {
262 262 
     "psxstr",
263 263 
     NULL_IF_CONFIG_SMALL("Sony Playstation STR format"),
264 264 
     sizeof(StrDemuxContext),
libavformat/pva.c
History View file @ c6610a2
... ... 
@@ -200,7 +200,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index,
200 200 
     return res;
201 201 
 }
202 202
203 
-AVInputFormat pva_demuxer = {
203 
+AVInputFormat ff_pva_demuxer = {
204 204 
     "pva",
205 205 
     NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"),
206 206 
     sizeof(PVAContext),
libavformat/qcp.c
History View file @ c6610a2
... ... 
@@ -187,7 +187,7 @@ static int qcp_read_packet(AVFormatContext *s, AVPacket *pkt)
187 187 
     return AVERROR_EOF;
188 188 
 }
189 189
190 
-AVInputFormat qcp_demuxer = {
190 
+AVInputFormat ff_qcp_demuxer = {
191 191 
     .name           = "qcp",
192 192 
     .long_name      = NULL_IF_CONFIG_SMALL("QCP format"),
193 193 
     .priv_data_size = sizeof(QCPContext),
libavformat/r3d.c
History View file @ c6610a2
... ... 
@@ -377,7 +377,7 @@ static int r3d_close(AVFormatContext *s)
377 377 
     return 0;
378 378 
 }
379 379
380 
-AVInputFormat r3d_demuxer = {
380 
+AVInputFormat ff_r3d_demuxer = {
381 381 
     "r3d",
382 382 
     NULL_IF_CONFIG_SMALL("REDCODE R3D format"),
383 383 
     sizeof(R3DContext),
libavformat/rawdec.c
History View file @ c6610a2
... ... 
@@ -138,7 +138,7 @@ int ff_raw_video_read_header(AVFormatContext *s,
138 138 
 /* Note: Do not forget to add new entries to the Makefile as well. */
139 139
140 140 
 #if CONFIG_G722_DEMUXER
141 
-AVInputFormat g722_demuxer = {
141 
+AVInputFormat ff_g722_demuxer = {
142 142 
     "g722",
143 143 
     NULL_IF_CONFIG_SMALL("raw G.722"),
144 144 
     0,
... ... 
@@ -152,7 +152,7 @@ AVInputFormat g722_demuxer = {
152 152 
 #endif
153 153
154 154 
 #if CONFIG_GSM_DEMUXER
155 
-AVInputFormat gsm_demuxer = {
155 
+AVInputFormat ff_gsm_demuxer = {
156 156 
     "gsm",
157 157 
     NULL_IF_CONFIG_SMALL("raw GSM"),
158 158 
     0,
... ... 
@@ -166,7 +166,7 @@ AVInputFormat gsm_demuxer = {
166 166 
 #endif
167 167
168 168 
 #if CONFIG_MJPEG_DEMUXER
169 
-AVInputFormat mjpeg_demuxer = {
169 
+AVInputFormat ff_mjpeg_demuxer = {
170 170 
     "mjpeg",
171 171 
     NULL_IF_CONFIG_SMALL("raw MJPEG video"),
172 172 
     0,
... ... 
@@ -180,7 +180,7 @@ AVInputFormat mjpeg_demuxer = {
180 180 
 #endif
181 181
182 182 
 #if CONFIG_MLP_DEMUXER
183 
-AVInputFormat mlp_demuxer = {
183 
+AVInputFormat ff_mlp_demuxer = {
184 184 
     "mlp",
185 185 
     NULL_IF_CONFIG_SMALL("raw MLP"),
186 186 
     0,
... ... 
@@ -194,7 +194,7 @@ AVInputFormat mlp_demuxer = {
194 194 
 #endif
195 195
196 196 
 #if CONFIG_TRUEHD_DEMUXER
197 
-AVInputFormat truehd_demuxer = {
197 
+AVInputFormat ff_truehd_demuxer = {
198 198 
     "truehd",
199 199 
     NULL_IF_CONFIG_SMALL("raw TrueHD"),
200 200 
     0,
... ... 
@@ -208,7 +208,7 @@ AVInputFormat truehd_demuxer = {
208 208 
 #endif
209 209
210 210 
 #if CONFIG_SHORTEN_DEMUXER
211 
-AVInputFormat shorten_demuxer = {
211 
+AVInputFormat ff_shorten_demuxer = {
212 212 
     "shn",
213 213 
     NULL_IF_CONFIG_SMALL("raw Shorten"),
214 214 
     0,
... ... 
@@ -222,7 +222,7 @@ AVInputFormat shorten_demuxer = {
222 222 
 #endif
223 223
224 224 
 #if CONFIG_VC1_DEMUXER
225 
-AVInputFormat vc1_demuxer = {
225 
+AVInputFormat ff_vc1_demuxer = {
226 226 
     "vc1",
227 227 
     NULL_IF_CONFIG_SMALL("raw VC-1"),
228 228 
     0,
libavformat/rawenc.c
History View file @ c6610a2
... ... 
@@ -33,7 +33,7 @@ int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt)
33 33 
 /* Note: Do not forget to add new entries to the Makefile as well. */
34 34
35 35 
 #if CONFIG_AC3_MUXER
36 
-AVOutputFormat ac3_muxer = {
36 
+AVOutputFormat ff_ac3_muxer = {
37 37 
     "ac3",
38 38 
     NULL_IF_CONFIG_SMALL("raw AC-3"),
39 39 
     "audio/x-ac3",
... ... 
@@ -48,7 +48,7 @@ AVOutputFormat ac3_muxer = {
48 48 
 #endif
49 49
50 50 
 #if CONFIG_DIRAC_MUXER
51 
-AVOutputFormat dirac_muxer = {
51 
+AVOutputFormat ff_dirac_muxer = {
52 52 
     "dirac",
53 53 
     NULL_IF_CONFIG_SMALL("raw Dirac"),
54 54 
     NULL,
... ... 
@@ -63,7 +63,7 @@ AVOutputFormat dirac_muxer = {
63 63 
 #endif
64 64
65 65 
 #if CONFIG_DNXHD_MUXER
66 
-AVOutputFormat dnxhd_muxer = {
66 
+AVOutputFormat ff_dnxhd_muxer = {
67 67 
     "dnxhd",
68 68 
     NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
69 69 
     NULL,
... ... 
@@ -78,7 +78,7 @@ AVOutputFormat dnxhd_muxer = {
78 78 
 #endif
79 79
80 80 
 #if CONFIG_DTS_MUXER
81 
-AVOutputFormat dts_muxer = {
81 
+AVOutputFormat ff_dts_muxer = {
82 82 
     "dts",
83 83 
     NULL_IF_CONFIG_SMALL("raw DTS"),
84 84 
     "audio/x-dca",
... ... 
@@ -93,7 +93,7 @@ AVOutputFormat dts_muxer = {
93 93 
 #endif
94 94
95 95 
 #if CONFIG_EAC3_MUXER
96 
-AVOutputFormat eac3_muxer = {
96 
+AVOutputFormat ff_eac3_muxer = {
97 97 
     "eac3",
98 98 
     NULL_IF_CONFIG_SMALL("raw E-AC-3"),
99 99 
     "audio/x-eac3",
... ... 
@@ -108,7 +108,7 @@ AVOutputFormat eac3_muxer = {
108 108 
 #endif
109 109
110 110 
 #if CONFIG_G722_MUXER
111 
-AVOutputFormat g722_muxer = {
111 
+AVOutputFormat ff_g722_muxer = {
112 112 
     "g722",
113 113 
     NULL_IF_CONFIG_SMALL("raw G.722"),
114 114 
     "audio/G722",
... ... 
@@ -123,7 +123,7 @@ AVOutputFormat g722_muxer = {
123 123 
 #endif
124 124
125 125 
 #if CONFIG_H261_MUXER
126 
-AVOutputFormat h261_muxer = {
126 
+AVOutputFormat ff_h261_muxer = {
127 127 
     "h261",
128 128 
     NULL_IF_CONFIG_SMALL("raw H.261"),
129 129 
     "video/x-h261",
... ... 
@@ -138,7 +138,7 @@ AVOutputFormat h261_muxer = {
138 138 
 #endif
139 139
140 140 
 #if CONFIG_H263_MUXER
141 
-AVOutputFormat h263_muxer = {
141 
+AVOutputFormat ff_h263_muxer = {
142 142 
     "h263",
143 143 
     NULL_IF_CONFIG_SMALL("raw H.263"),
144 144 
     "video/x-h263",
... ... 
@@ -153,7 +153,7 @@ AVOutputFormat h263_muxer = {
153 153 
 #endif
154 154
155 155 
 #if CONFIG_H264_MUXER
156 
-AVOutputFormat h264_muxer = {
156 
+AVOutputFormat ff_h264_muxer = {
157 157 
     "h264",
158 158 
     NULL_IF_CONFIG_SMALL("raw H.264 video format"),
159 159 
     NULL,
... ... 
@@ -168,7 +168,7 @@ AVOutputFormat h264_muxer = {
168 168 
 #endif
169 169
170 170 
 #if CONFIG_CAVSVIDEO_MUXER
171 
-AVOutputFormat cavsvideo_muxer = {
171 
+AVOutputFormat ff_cavsvideo_muxer = {
172 172 
     "cavsvideo",
173 173 
     NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
174 174 
     NULL,
... ... 
@@ -183,7 +183,7 @@ AVOutputFormat cavsvideo_muxer = {
183 183 
 #endif
184 184
185 185 
 #if CONFIG_M4V_MUXER
186 
-AVOutputFormat m4v_muxer = {
186 
+AVOutputFormat ff_m4v_muxer = {
187 187 
     "m4v",
188 188 
     NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
189 189 
     NULL,
... ... 
@@ -198,7 +198,7 @@ AVOutputFormat m4v_muxer = {
198 198 
 #endif
199 199
200 200 
 #if CONFIG_MJPEG_MUXER
201 
-AVOutputFormat mjpeg_muxer = {
201 
+AVOutputFormat ff_mjpeg_muxer = {
202 202 
     "mjpeg",
203 203 
     NULL_IF_CONFIG_SMALL("raw MJPEG video"),
204 204 
     "video/x-mjpeg",
... ... 
@@ -213,7 +213,7 @@ AVOutputFormat mjpeg_muxer = {
213 213 
 #endif
214 214
215 215 
 #if CONFIG_MLP_MUXER
216 
-AVOutputFormat mlp_muxer = {
216 
+AVOutputFormat ff_mlp_muxer = {
217 217 
     "mlp",
218 218 
     NULL_IF_CONFIG_SMALL("raw MLP"),
219 219 
     NULL,
... ... 
@@ -228,7 +228,7 @@ AVOutputFormat mlp_muxer = {
228 228 
 #endif
229 229
230 230 
 #if CONFIG_SRT_MUXER
231 
-AVOutputFormat srt_muxer = {
231 
+AVOutputFormat ff_srt_muxer = {
232 232 
     .name           = "srt",
233 233 
     .long_name      = NULL_IF_CONFIG_SMALL("SubRip subtitle format"),
234 234 
     .mime_type      = "application/x-subrip",
... ... 
@@ -240,7 +240,7 @@ AVOutputFormat srt_muxer = {
240 240 
 #endif
241 241
242 242 
 #if CONFIG_TRUEHD_MUXER
243 
-AVOutputFormat truehd_muxer = {
243 
+AVOutputFormat ff_truehd_muxer = {
244 244 
     "truehd",
245 245 
     NULL_IF_CONFIG_SMALL("raw TrueHD"),
246 246 
     NULL,
... ... 
@@ -255,7 +255,7 @@ AVOutputFormat truehd_muxer = {
255 255 
 #endif
256 256
257 257 
 #if CONFIG_MPEG1VIDEO_MUXER
258 
-AVOutputFormat mpeg1video_muxer = {
258 
+AVOutputFormat ff_mpeg1video_muxer = {
259 259 
     "mpeg1video",
260 260 
     NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
261 261 
     "video/x-mpeg",
... ... 
@@ -270,7 +270,7 @@ AVOutputFormat mpeg1video_muxer = {
270 270 
 #endif
271 271
272 272 
 #if CONFIG_MPEG2VIDEO_MUXER
273 
-AVOutputFormat mpeg2video_muxer = {
273 
+AVOutputFormat ff_mpeg2video_muxer = {
274 274 
     "mpeg2video",
275 275 
     NULL_IF_CONFIG_SMALL("raw MPEG-2 video"),
276 276 
     NULL,
... ... 
@@ -285,7 +285,7 @@ AVOutputFormat mpeg2video_muxer = {
285 285 
 #endif
286 286
287 287 
 #if CONFIG_RAWVIDEO_MUXER
288 
-AVOutputFormat rawvideo_muxer = {
288 
+AVOutputFormat ff_rawvideo_muxer = {
289 289 
     "rawvideo",
290 290 
     NULL_IF_CONFIG_SMALL("raw video format"),
291 291 
     NULL,
libavformat/rawvideodec.c
History View file @ c6610a2
... ... 
@@ -44,7 +44,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
44 44 
     return 0;
45 45 
 }
46 46
47 
-AVInputFormat rawvideo_demuxer = {
47 
+AVInputFormat ff_rawvideo_demuxer = {
48 48 
     "rawvideo",
49 49 
     NULL_IF_CONFIG_SMALL("raw video format"),
50 50 
     0,
libavformat/rdt.c
History View file @ c6610a2
... ... 
@@ -528,7 +528,7 @@ rdt_new_context (void)
528 528 
 {
529 529 
     PayloadContext *rdt = av_mallocz(sizeof(PayloadContext));
530 530
531 
-    av_open_input_stream(&rdt->rmctx, NULL, "", &rdt_demuxer, NULL);
531 
+    av_open_input_stream(&rdt->rmctx, NULL, "", &ff_rdt_demuxer, NULL);
532 532
533 533 
     return rdt;
534 534 
 }
libavformat/rl2.c
History View file @ c6610a2
... ... 
@@ -287,7 +287,7 @@ static int rl2_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
287 287 
     return 0;
288 288 
 }
289 289
290 
-AVInputFormat rl2_demuxer = {
290 
+AVInputFormat ff_rl2_demuxer = {
291 291 
     "rl2",
292 292 
     NULL_IF_CONFIG_SMALL("RL2 format"),
293 293 
     sizeof(Rl2DemuxContext),
libavformat/rm.h
History View file @ c6610a2
... ... 
@@ -35,7 +35,7 @@ RMStream *ff_rm_alloc_rmstream (void);
35 35 
 void      ff_rm_free_rmstream  (RMStream *rms);
36 36
37 37 
 /*< input format for Realmedia-style RTSP streams */
38 
-extern AVInputFormat rdt_demuxer;
38 
+extern AVInputFormat ff_rdt_demuxer;
39 39
40 40 
 /**
41 41 
  * Read the MDPR chunk, which contains stream-specific codec initialization
libavformat/rmdec.c
History View file @ c6610a2
... ... 
@@ -935,7 +935,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
935 935 
     return dts;
936 936 
 }
937 937
938 
-AVInputFormat rm_demuxer = {
938 
+AVInputFormat ff_rm_demuxer = {
939 939 
     "rm",
940 940 
     NULL_IF_CONFIG_SMALL("RealMedia format"),
941 941 
     sizeof(RMDemuxContext),
... ... 
@@ -947,7 +947,7 @@ AVInputFormat rm_demuxer = {
947 947 
     rm_read_dts,
948 948 
 };
949 949
950 
-AVInputFormat rdt_demuxer = {
950 
+AVInputFormat ff_rdt_demuxer = {
951 951 
     "rdt",
952 952 
     NULL_IF_CONFIG_SMALL("RDT demuxer"),
953 953 
     sizeof(RMDemuxContext),
libavformat/rmenc.c
History View file @ c6610a2
... ... 
@@ -457,7 +457,7 @@ static int rm_write_trailer(AVFormatContext *s)
457 457 
 }
458 458
459 459
460 
-AVOutputFormat rm_muxer = {
460 
+AVOutputFormat ff_rm_muxer = {
461 461 
     "rm",
462 462 
     NULL_IF_CONFIG_SMALL("RealMedia format"),
463 463 
     "application/vnd.rn-realmedia",
libavformat/rpl.c
History View file @ c6610a2
... ... 
@@ -349,7 +349,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt)
349 349 
     return ret;
350 350 
 }
351 351
352 
-AVInputFormat rpl_demuxer = {
352 
+AVInputFormat ff_rpl_demuxer = {
353 353 
     "rpl",
354 354 
     NULL_IF_CONFIG_SMALL("RPL/ARMovie format"),
355 355 
     sizeof(RPLContext),
libavformat/rsodec.c
History View file @ c6610a2
... ... 
@@ -88,7 +88,7 @@ static int rso_read_packet(AVFormatContext *s, AVPacket *pkt)
88 88 
     return 0;
89 89 
 }
90 90
91 
-AVInputFormat rso_demuxer = {
91 
+AVInputFormat ff_rso_demuxer = {
92 92 
     .name           =   "rso",
93 93 
     .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
94 94 
     .extensions     =   "rso",
libavformat/rsoenc.c
History View file @ c6610a2
... ... 
@@ -100,7 +100,7 @@ static int rso_write_trailer(AVFormatContext *s)
100 100 
     return 0;
101 101 
 }
102 102
103 
-AVOutputFormat rso_muxer = {
103 
+AVOutputFormat ff_rso_muxer = {
104 104 
     .name           =   "rso",
105 105 
     .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
106 106 
     .extensions     =   "rso",
libavformat/rtmpproto.c
History View file @ c6610a2
... ... 
@@ -989,7 +989,7 @@ static int rtmp_write(URLContext *h, const uint8_t *buf, int size)
989 989 
     return size;
990 990 
 }
991 991
992 
-URLProtocol rtmp_protocol = {
992 
+URLProtocol ff_rtmp_protocol = {
993 993 
     "rtmp",
994 994 
     rtmp_open,
995 995 
     rtmp_read,
libavformat/rtpdec_asf.c
History View file @ c6610a2
... ... 
@@ -109,7 +109,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
109 109 
             av_close_input_stream(rt->asf_ctx);
110 110 
             rt->asf_ctx = NULL;
111 111 
         }
112 
-        ret = av_open_input_stream(&rt->asf_ctx, &pb, "", &asf_demuxer, NULL);
112 
+        ret = av_open_input_stream(&rt->asf_ctx, &pb, "", &ff_asf_demuxer, NULL);
113 113 
         if (ret < 0)
114 114 
             return ret;
115 115 
         av_metadata_copy(&s->metadata, rt->asf_ctx->metadata, 0);
libavformat/rtpenc.c
History View file @ c6610a2
... ... 
@@ -444,7 +444,7 @@ static int rtp_write_trailer(AVFormatContext *s1)
444 444 
     return 0;
445 445 
 }
446 446
447 
-AVOutputFormat rtp_muxer = {
447 
+AVOutputFormat ff_rtp_muxer = {
448 448 
     "rtp",
449 449 
     NULL_IF_CONFIG_SMALL("RTP output format"),
450 450 
     NULL,
libavformat/rtpproto.c
History View file @ c6610a2
... ... 
@@ -359,7 +359,7 @@ int rtp_get_rtcp_file_handle(URLContext *h) {
359 359 
     return s->rtcp_fd;
360 360 
 }
361 361
362 
-URLProtocol rtp_protocol = {
362 
+URLProtocol ff_rtp_protocol = {
363 363 
     "rtp",
364 364 
     rtp_open,
365 365 
     rtp_read,
libavformat/rtsp.c
History View file @ c6610a2
... ... 
@@ -1825,7 +1825,7 @@ static int sdp_read_close(AVFormatContext *s)
1825 1825 
     return 0;
1826 1826 
 }
1827 1827
1828 
-AVInputFormat sdp_demuxer = {
1828 
+AVInputFormat ff_sdp_demuxer = {
1829 1829 
     "sdp",
1830 1830 
     NULL_IF_CONFIG_SMALL("SDP"),
1831 1831 
     sizeof(RTSPState),
... ... 
@@ -1929,7 +1929,7 @@ fail:
1929 1929 
     return ret;
1930 1930 
 }
1931 1931
1932 
-AVInputFormat rtp_demuxer = {
1932 
+AVInputFormat ff_rtp_demuxer = {
1933 1933 
     "rtp",
1934 1934 
     NULL_IF_CONFIG_SMALL("RTP input format"),
1935 1935 
     sizeof(RTSPState),
libavformat/rtspdec.c
History View file @ c6610a2
... ... 
@@ -395,7 +395,7 @@ static int rtsp_read_close(AVFormatContext *s)
395 395 
     return 0;
396 396 
 }
397 397
398 
-AVInputFormat rtsp_demuxer = {
398 
+AVInputFormat ff_rtsp_demuxer = {
399 399 
     "rtsp",
400 400 
     NULL_IF_CONFIG_SMALL("RTSP input format"),
401 401 
     sizeof(RTSPState),
libavformat/rtspenc.c
History View file @ c6610a2
... ... 
@@ -233,7 +233,7 @@ static int rtsp_write_close(AVFormatContext *s)
233 233 
     return 0;
234 234 
 }
235 235
236 
-AVOutputFormat rtsp_muxer = {
236 
+AVOutputFormat ff_rtsp_muxer = {
237 237 
     "rtsp",
238 238 
     NULL_IF_CONFIG_SMALL("RTSP output format"),
239 239 
     NULL,
libavformat/sapdec.c
History View file @ c6610a2
... ... 
@@ -226,7 +226,7 @@ static int sap_fetch_packet(AVFormatContext *s, AVPacket *pkt)
226 226 
     return ret;
227 227 
 }
228 228
229 
-AVInputFormat sap_demuxer = {
229 
+AVInputFormat ff_sap_demuxer = {
230 230 
     "sap",
231 231 
     NULL_IF_CONFIG_SMALL("SAP input format"),
232 232 
     sizeof(struct SAPState),
libavformat/sapenc.c
History View file @ c6610a2
... ... 
@@ -250,7 +250,7 @@ static int sap_write_packet(AVFormatContext *s, AVPacket *pkt)
250 250 
     return ff_write_chained(rtpctx, 0, pkt, s);
251 251 
 }
252 252
253 
-AVOutputFormat sap_muxer = {
253 
+AVOutputFormat ff_sap_muxer = {
254 254 
     "sap",
255 255 
     NULL_IF_CONFIG_SMALL("SAP output format"),
256 256 
     NULL,
libavformat/segafilm.c
History View file @ c6610a2
... ... 
@@ -282,7 +282,7 @@ static int film_read_close(AVFormatContext *s)
282 282 
     return 0;
283 283 
 }
284 284
285 
-AVInputFormat segafilm_demuxer = {
285 
+AVInputFormat ff_segafilm_demuxer = {
286 286 
     "film_cpk",
287 287 
     NULL_IF_CONFIG_SMALL("Sega FILM/CPK format"),
288 288 
     sizeof(FilmDemuxContext),
libavformat/sierravmd.c
History View file @ c6610a2
... ... 
@@ -280,7 +280,7 @@ static int vmd_read_close(AVFormatContext *s)
280 280 
     return 0;
281 281 
 }
282 282
283 
-AVInputFormat vmd_demuxer = {
283 
+AVInputFormat ff_vmd_demuxer = {
284 284 
     "vmd",
285 285 
     NULL_IF_CONFIG_SMALL("Sierra VMD format"),
286 286 
     sizeof(VmdDemuxContext),
libavformat/siff.c
History View file @ c6610a2
... ... 
@@ -227,7 +227,7 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
227 227 
     return pkt->size;
228 228 
 }
229 229
230 
-AVInputFormat siff_demuxer = {
230 
+AVInputFormat ff_siff_demuxer = {
231 231 
     "siff",
232 232 
     NULL_IF_CONFIG_SMALL("Beam Software SIFF"),
233 233 
     sizeof(SIFFContext),
libavformat/smacker.c
History View file @ c6610a2
... ... 
@@ -344,7 +344,7 @@ static int smacker_read_close(AVFormatContext *s)
344 344 
     return 0;
345 345 
 }
346 346
347 
-AVInputFormat smacker_demuxer = {
347 
+AVInputFormat ff_smacker_demuxer = {
348 348 
     "smk",
349 349 
     NULL_IF_CONFIG_SMALL("Smacker video"),
350 350 
     sizeof(SmackerContext),
libavformat/sol.c
History View file @ c6610a2
... ... 
@@ -141,7 +141,7 @@ static int sol_read_packet(AVFormatContext *s,
141 141 
     return 0;
142 142 
 }
143 143
144 
-AVInputFormat sol_demuxer = {
144 
+AVInputFormat ff_sol_demuxer = {
145 145 
     "sol",
146 146 
     NULL_IF_CONFIG_SMALL("Sierra SOL format"),
147 147 
     0,
libavformat/soxdec.c
History View file @ c6610a2
... ... 
@@ -140,7 +140,7 @@ static int sox_read_packet(AVFormatContext *s,
140 140 
     return 0;
141 141 
 }
142 142
143 
-AVInputFormat sox_demuxer = {
143 
+AVInputFormat ff_sox_demuxer = {
144 144 
     "sox",
145 145 
     NULL_IF_CONFIG_SMALL("SoX native format"),
146 146 
     0,
libavformat/soxenc.c
History View file @ c6610a2
... ... 
@@ -112,7 +112,7 @@ static int sox_write_trailer(AVFormatContext *s)
112 112 
     return 0;
113 113 
 }
114 114
115 
-AVOutputFormat sox_muxer = {
115 
+AVOutputFormat ff_sox_muxer = {
116 116 
     "sox",
117 117 
     NULL_IF_CONFIG_SMALL("SoX native format"),
118 118 
     NULL,
libavformat/spdifdec.c
History View file @ c6610a2
... ... 
@@ -225,7 +225,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt)
225 225 
     return 0;
226 226 
 }
227 227
228 
-AVInputFormat spdif_demuxer = {
228 
+AVInputFormat ff_spdif_demuxer = {
229 229 
     "spdif",
230 230 
     NULL_IF_CONFIG_SMALL("IEC 61937 (compressed data in S/PDIF)"),
231 231 
     0,
libavformat/spdifenc.c
History View file @ c6610a2
... ... 
@@ -382,7 +382,7 @@ static int spdif_write_packet(struct AVFormatContext *s, AVPacket *pkt)
382 382 
     return 0;
383 383 
 }
384 384
385 
-AVOutputFormat spdif_muxer = {
385 
+AVOutputFormat ff_spdif_muxer = {
386 386 
     "spdif",
387 387 
     NULL_IF_CONFIG_SMALL("IEC 61937 (used on S/PDIF - IEC958)"),
388 388 
     NULL,
libavformat/srtdec.c
History View file @ c6610a2
... ... 
@@ -92,7 +92,7 @@ static int srt_read_packet(AVFormatContext *s, AVPacket *pkt)
92 92 
     return res;
93 93 
 }
94 94
95 
-AVInputFormat srt_demuxer = {
95 
+AVInputFormat ff_srt_demuxer = {
96 96 
     .name        = "srt",
97 97 
     .long_name   = NULL_IF_CONFIG_SMALL("SubRip subtitle format"),
98 98 
     .read_probe  = srt_probe,
libavformat/swfdec.c
History View file @ c6610a2
... ... 
@@ -207,7 +207,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
207 207 
     return 0;
208 208 
 }
209 209
210 
-AVInputFormat swf_demuxer = {
210 
+AVInputFormat ff_swf_demuxer = {
211 211 
     "swf",
212 212 
     NULL_IF_CONFIG_SMALL("Flash format"),
213 213 
     sizeof(SWFContext),
libavformat/swfenc.c
History View file @ c6610a2
... ... 
@@ -506,7 +506,7 @@ static int swf_write_trailer(AVFormatContext *s)
506 506 
 }
507 507
508 508 
 #if CONFIG_SWF_MUXER
509 
-AVOutputFormat swf_muxer = {
509 
+AVOutputFormat ff_swf_muxer = {
510 510 
     "swf",
511 511 
     NULL_IF_CONFIG_SMALL("Flash format"),
512 512 
     "application/x-shockwave-flash",
... ... 
@@ -520,7 +520,7 @@ AVOutputFormat swf_muxer = {
520 520 
 };
521 521 
 #endif
522 522 
 #if CONFIG_AVM2_MUXER
523 
-AVOutputFormat avm2_muxer = {
523 
+AVOutputFormat ff_avm2_muxer = {
524 524 
     "avm2",
525 525 
     NULL_IF_CONFIG_SMALL("Flash 9 (AVM2) format"),
526 526 
     "application/x-shockwave-flash",
libavformat/tcp.c
History View file @ c6610a2
... ... 
@@ -218,7 +218,7 @@ static int tcp_get_file_handle(URLContext *h)
218 218 
     return s->fd;
219 219 
 }
220 220
221 
-URLProtocol tcp_protocol = {
221 
+URLProtocol ff_tcp_protocol = {
222 222 
     "tcp",
223 223 
     tcp_open,
224 224 
     tcp_read,
libavformat/thp.c
History View file @ c6610a2
... ... 
@@ -187,7 +187,7 @@ static int thp_read_packet(AVFormatContext *s,
187 187 
     return 0;
188 188 
 }
189 189
190 
-AVInputFormat thp_demuxer = {
190 
+AVInputFormat ff_thp_demuxer = {
191 191 
     "thp",
192 192 
     NULL_IF_CONFIG_SMALL("THP"),
193 193 
     sizeof(ThpDemuxContext),
libavformat/tiertexseq.c
History View file @ c6610a2
... ... 
@@ -302,7 +302,7 @@ static int seq_read_close(AVFormatContext *s)
302 302 
     return 0;
303 303 
 }
304 304
305 
-AVInputFormat tiertexseq_demuxer = {
305 
+AVInputFormat ff_tiertexseq_demuxer = {
306 306 
     "tiertexseq",
307 307 
     NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ format"),
308 308 
     sizeof(SeqDemuxContext),
libavformat/tmv.c
History View file @ c6610a2
... ... 
@@ -178,7 +178,7 @@ static int tmv_read_seek(AVFormatContext *s, int stream_index,
178 178 
     return 0;
179 179 
 }
180 180
181 
-AVInputFormat tmv_demuxer = {
181 
+AVInputFormat ff_tmv_demuxer = {
182 182 
     "tmv",
183 183 
     NULL_IF_CONFIG_SMALL("8088flex TMV"),
184 184 
     sizeof(TMVContext),
libavformat/tta.c
History View file @ c6610a2
... ... 
@@ -143,7 +143,7 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
143 143 
     return 0;
144 144 
 }
145 145
146 
-AVInputFormat tta_demuxer = {
146 
+AVInputFormat ff_tta_demuxer = {
147 147 
     "tta",
148 148 
     NULL_IF_CONFIG_SMALL("True Audio"),
149 149 
     sizeof(TTAContext),
libavformat/tty.c
History View file @ c6610a2
... ... 
@@ -124,7 +124,7 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
124 124 
     return 0;
125 125 
 }
126 126
127 
-AVInputFormat tty_demuxer = {
127 
+AVInputFormat ff_tty_demuxer = {
128 128 
     .name           = "tty",
129 129 
     .long_name      = NULL_IF_CONFIG_SMALL("Tele-typewriter"),
130 130 
     .priv_data_size = sizeof(TtyDemuxContext),
libavformat/txd.c
History View file @ c6610a2
... ... 
@@ -90,7 +90,7 @@ next_chunk:
90 90 
     return 0;
91 91 
 }
92 92
93 
-AVInputFormat txd_demuxer =
93 
+AVInputFormat ff_txd_demuxer =
94 94 
 {
95 95 
     "txd",
96 96 
     NULL_IF_CONFIG_SMALL("Renderware TeXture Dictionary"),
libavformat/udp.c
History View file @ c6610a2
... ... 
@@ -498,7 +498,7 @@ static int udp_close(URLContext *h)
498 498 
     return 0;
499 499 
 }
500 500
501 
-URLProtocol udp_protocol = {
501 
+URLProtocol ff_udp_protocol = {
502 502 
     "udp",
503 503 
     udp_open,
504 504 
     udp_read,
libavformat/vc1test.c
History View file @ c6610a2
... ... 
@@ -109,7 +109,7 @@ static int vc1t_read_packet(AVFormatContext *s,
109 109 
     return pkt->size;
110 110 
 }
111 111
112 
-AVInputFormat vc1t_demuxer = {
112 
+AVInputFormat ff_vc1t_demuxer = {
113 113 
     "vc1test",
114 114 
     NULL_IF_CONFIG_SMALL("VC-1 test bitstream format"),
115 115 
     0,
libavformat/vc1testenc.c
History View file @ c6610a2
... ... 
@@ -80,7 +80,7 @@ static int vc1test_write_trailer(AVFormatContext *s)
80 80 
     return 0;
81 81 
 }
82 82
83 
-AVOutputFormat vc1t_muxer = {
83 
+AVOutputFormat ff_vc1t_muxer = {
84 84 
     "rcv",
85 85 
     NULL_IF_CONFIG_SMALL("VC-1 test bitstream"),
86 86 
     "",
libavformat/vocdec.c
History View file @ c6610a2
... ... 
@@ -156,7 +156,7 @@ static int voc_read_packet(AVFormatContext *s, AVPacket *pkt)
156 156 
     return voc_get_packet(s, pkt, s->streams[0], 0);
157 157 
 }
158 158
159 
-AVInputFormat voc_demuxer = {
159 
+AVInputFormat ff_voc_demuxer = {
160 160 
     "voc",
161 161 
     NULL_IF_CONFIG_SMALL("Creative Voice file format"),
162 162 
     sizeof(VocDecContext),
libavformat/vocenc.c
History View file @ c6610a2
... ... 
@@ -89,7 +89,7 @@ static int voc_write_trailer(AVFormatContext *s)
89 89 
     return 0;
90 90 
 }
91 91
92 
-AVOutputFormat voc_muxer = {
92 
+AVOutputFormat ff_voc_muxer = {
93 93 
     "voc",
94 94 
     NULL_IF_CONFIG_SMALL("Creative Voice file format"),
95 95 
     "audio/x-voc",
libavformat/vqf.c
History View file @ c6610a2
... ... 
@@ -247,7 +247,7 @@ static int vqf_read_seek(AVFormatContext *s,
247 247 
     return 0;
248 248 
 }
249 249
250 
-AVInputFormat vqf_demuxer = {
250 
+AVInputFormat ff_vqf_demuxer = {
251 251 
     "vqf",
252 252 
     NULL_IF_CONFIG_SMALL("Nippon Telegraph and Telephone Corporation (NTT) TwinVQ"),
253 253 
     sizeof(VqfContext),
libavformat/wav.c
History View file @ c6610a2
... ... 
@@ -123,7 +123,7 @@ static int wav_write_trailer(AVFormatContext *s)
123 123 
     return 0;
124 124 
 }
125 125
126 
-AVOutputFormat wav_muxer = {
126 
+AVOutputFormat ff_wav_muxer = {
127 127 
     "wav",
128 128 
     NULL_IF_CONFIG_SMALL("WAV format"),
129 129 
     "audio/x-wav",
... ... 
@@ -340,7 +340,7 @@ static int wav_read_seek(AVFormatContext *s,
340 340 
     return pcm_read_seek(s, stream_index, timestamp, flags);
341 341 
 }
342 342
343 
-AVInputFormat wav_demuxer = {
343 
+AVInputFormat ff_wav_demuxer = {
344 344 
     "wav",
345 345 
     NULL_IF_CONFIG_SMALL("WAV format"),
346 346 
     sizeof(WAVContext),
... ... 
@@ -426,7 +426,7 @@ static int w64_read_header(AVFormatContext *s, AVFormatParameters *ap)
426 426 
     return 0;
427 427 
 }
428 428
429 
-AVInputFormat w64_demuxer = {
429 
+AVInputFormat ff_w64_demuxer = {
430 430 
     "w64",
431 431 
     NULL_IF_CONFIG_SMALL("Sony Wave64 format"),
432 432 
     sizeof(WAVContext),
libavformat/wc3movie.c
History View file @ c6610a2
... ... 
@@ -291,7 +291,7 @@ static int wc3_read_close(AVFormatContext *s)
291 291 
     return 0;
292 292 
 }
293 293
294 
-AVInputFormat wc3_demuxer = {
294 
+AVInputFormat ff_wc3_demuxer = {
295 295 
     "wc3movie",
296 296 
     NULL_IF_CONFIG_SMALL("Wing Commander III movie format"),
297 297 
     sizeof(Wc3DemuxContext),
libavformat/westwood.c
History View file @ c6610a2
... ... 
@@ -367,7 +367,7 @@ static int wsvqa_read_packet(AVFormatContext *s,
367 367 
 }
368 368
369 369 
 #if CONFIG_WSAUD_DEMUXER
370 
-AVInputFormat wsaud_demuxer = {
370 
+AVInputFormat ff_wsaud_demuxer = {
371 371 
     "wsaud",
372 372 
     NULL_IF_CONFIG_SMALL("Westwood Studios audio format"),
373 373 
     sizeof(WsAudDemuxContext),
... ... 
@@ -377,7 +377,7 @@ AVInputFormat wsaud_demuxer = {
377 377 
 };
378 378 
 #endif
379 379 
 #if CONFIG_WSVQA_DEMUXER
380 
-AVInputFormat wsvqa_demuxer = {
380 
+AVInputFormat ff_wsvqa_demuxer = {
381 381 
     "wsvqa",
382 382 
     NULL_IF_CONFIG_SMALL("Westwood Studios VQA format"),
383 383 
     sizeof(WsVqaDemuxContext),
libavformat/wtv.c
History View file @ c6610a2
... ... 
@@ -595,7 +595,7 @@ static int read_seek2(AVFormatContext *s, int stream_index,
595 595 
     }
596 596 
 }
597 597
598 
-AVInputFormat wtv_demuxer = {
598 
+AVInputFormat ff_wtv_demuxer = {
599 599 
     .name           = "wtv",
600 600 
     .long_name      = NULL_IF_CONFIG_SMALL("Windows Television (WTV)"),
601 601 
     .priv_data_size = sizeof(WtvContext),
libavformat/wv.c
History View file @ c6610a2
... ... 
@@ -339,7 +339,7 @@ static int wv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
339 339 
     return 0;
340 340 
 }
341 341
342 
-AVInputFormat wv_demuxer = {
342 
+AVInputFormat ff_wv_demuxer = {
343 343 
     "wv",
344 344 
     NULL_IF_CONFIG_SMALL("WavPack"),
345 345 
     sizeof(WVContext),
libavformat/xa.c
History View file @ c6610a2
... ... 
@@ -118,7 +118,7 @@ static int xa_read_packet(AVFormatContext *s,
118 118 
     return ret;
119 119 
 }
120 120
121 
-AVInputFormat xa_demuxer = {
121 
+AVInputFormat ff_xa_demuxer = {
122 122 
     "xa",
123 123 
     NULL_IF_CONFIG_SMALL("Maxis XA File Format"),
124 124 
     sizeof(MaxisXADemuxContext),
libavformat/yop.c
History View file @ c6610a2
... ... 
@@ -202,7 +202,7 @@ static int yop_read_seek(AVFormatContext *s, int stream_index,
202 202 
     return 0;
203 203 
 }
204 204
205 
-AVInputFormat yop_demuxer = {
205 
+AVInputFormat ff_yop_demuxer = {
206 206 
     "yop",
207 207 
     NULL_IF_CONFIG_SMALL("Psygnosis YOP Format"),
208 208 
     sizeof(YopDecContext),
libavformat/yuv4mpeg.c
History View file @ c6610a2
... ... 
@@ -169,7 +169,7 @@ static int yuv4_write_header(AVFormatContext *s)
169 169 
     return 0;
170 170 
 }
171 171
172 
-AVOutputFormat yuv4mpegpipe_muxer = {
172 
+AVOutputFormat ff_yuv4mpegpipe_muxer = {
173 173 
     "yuv4mpegpipe",
174 174 
     NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
175 175 
     "",
... ... 
@@ -390,7 +390,7 @@ static int yuv4_probe(AVProbeData *pd)
390 390 
 }
391 391
392 392 
 #if CONFIG_YUV4MPEGPIPE_DEMUXER
393 
-AVInputFormat yuv4mpegpipe_demuxer = {
393 
+AVInputFormat ff_yuv4mpegpipe_demuxer = {
394 394 
     "yuv4mpegpipe",
395 395 
     NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
396 396 
     sizeof(struct frame_attributes),