Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parser…

…s, bsf. None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <[email protected]> (cherry picked from commit d36beb3)
duncanchan · Jan 28, 2011 · e7e2df2 · e7e2df2
1 parent 4b21c38
commit e7e2df2
Show file tree

Hide file tree

Showing 268 changed files with 358 additions and 358 deletions.
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
@@ -865,7 +865,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
     return 0;
 }
 
-AVCodec fourxm_decoder = {
+AVCodec ff_fourxm_decoder = {
     "4xm",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_4XM,

diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
@@ -219,7 +219,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 
 
-AVCodec eightbps_decoder = {
+AVCodec ff_eightbps_decoder = {
         "8bps",
         AVMEDIA_TYPE_VIDEO,
         CODEC_ID_8BPS,

diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
@@ -92,7 +92,7 @@ static av_cold int eightsvx_decode_init(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec eightsvx_fib_decoder = {
+AVCodec ff_eightsvx_fib_decoder = {
   .name           = "8svx_fib",
   .type           = AVMEDIA_TYPE_AUDIO,
   .id             = CODEC_ID_8SVX_FIB,
@@ -102,7 +102,7 @@ AVCodec eightsvx_fib_decoder = {
   .long_name      = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
 };
 
-AVCodec eightsvx_exp_decoder = {
+AVCodec ff_eightsvx_exp_decoder = {
   .name           = "8svx_exp",
   .type           = AVMEDIA_TYPE_AUDIO,
   .id             = CODEC_ID_8SVX_EXP,

diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c
@@ -362,7 +362,7 @@ static int a64multi_encode_frame(AVCodecContext *avctx, unsigned char *buf,
     return 0;
 }
 
-AVCodec a64multi_encoder = {
+AVCodec ff_a64multi_encoder = {
     .name           = "a64multi",
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_A64_MULTI,
@@ -375,7 +375,7 @@ AVCodec a64multi_encoder = {
     .capabilities   = CODEC_CAP_DELAY,
 };
 
-AVCodec a64multi5_encoder = {
+AVCodec ff_a64multi5_encoder = {
     .name           = "a64multi5",
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_A64_MULTI5,

diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c
@@ -107,7 +107,7 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
     return 0;
 }
 
-AVBitStreamFilter aac_adtstoasc_bsf = {
+AVBitStreamFilter ff_aac_adtstoasc_bsf = {
     "aac_adtstoasc",
     sizeof(AACBSFContext),
     aac_adtstoasc_filter,

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
@@ -60,7 +60,7 @@ static av_cold int aac_parse_init(AVCodecParserContext *s1)
 }
 
 
-AVCodecParser aac_parser = {
+AVCodecParser ff_aac_parser = {
     { CODEC_ID_AAC },
     sizeof(AACAC3ParseContext),
     aac_parse_init,

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
@@ -2351,7 +2351,7 @@ av_cold static int latm_decode_init(AVCodecContext *avctx)
 }
 
 
-AVCodec aac_decoder = {
+AVCodec ff_aac_decoder = {
     "aac",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AAC,
@@ -2372,7 +2372,7 @@ AVCodec aac_decoder = {
     in MPEG transport streams which only contain one program.
     To do a more complex LATM demuxing a separate LATM demuxer should be used.
 */
-AVCodec aac_latm_decoder = {
+AVCodec ff_aac_latm_decoder = {
     .name = "aac_latm",
     .type = CODEC_TYPE_AUDIO,
     .id   = CODEC_ID_AAC_LATM,

diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
@@ -641,7 +641,7 @@ static av_cold int aac_encode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec aac_encoder = {
+AVCodec ff_aac_encoder = {
     "aac",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AAC,

diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
@@ -109,7 +109,7 @@ static av_cold int aasc_decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec aasc_decoder = {
+AVCodec ff_aasc_decoder = {
     "aasc",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_AASC,

diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
@@ -169,7 +169,7 @@ static av_cold int ac3_parse_init(AVCodecParserContext *s1)
 }
 
 
-AVCodecParser ac3_parser = {
+AVCodecParser ff_ac3_parser = {
     { CODEC_ID_AC3, CODEC_ID_EAC3 },
     sizeof(AACAC3ParseContext),
     ac3_parse_init,

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
@@ -1437,7 +1437,7 @@ static av_cold int ac3_decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec ac3_decoder = {
+AVCodec ff_ac3_decoder = {
     .name = "ac3",
     .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_AC3,
@@ -1449,7 +1449,7 @@ AVCodec ac3_decoder = {
 };
 
 #if CONFIG_EAC3_DECODER
-AVCodec eac3_decoder = {
+AVCodec ff_eac3_decoder = {
     .name = "eac3",
     .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_EAC3,

diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c
@@ -425,7 +425,7 @@ int main(void)
 #endif /* TEST */
 
 
-AVCodec ac3_fixed_encoder = {
+AVCodec ff_ac3_fixed_encoder = {
     "ac3_fixed",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AC3,

diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c
@@ -109,7 +109,7 @@ static void scale_coefficients(AC3EncodeContext *s)
 }
 
 
-AVCodec ac3_encoder = {
+AVCodec ff_ac3_encoder = {
     "ac3",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AC3,

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
@@ -1708,7 +1708,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
 
 #if CONFIG_ENCODERS
 #define ADPCM_ENCODER(id,name,long_name_)       \
-AVCodec name ## _encoder = {                    \
+AVCodec ff_ ## name ## _encoder = {             \
     #name,                                      \
     AVMEDIA_TYPE_AUDIO,                         \
     id,                                         \
@@ -1726,7 +1726,7 @@ AVCodec name ## _encoder = {                    \
 
 #if CONFIG_DECODERS
 #define ADPCM_DECODER(id,name,long_name_)       \
-AVCodec name ## _decoder = {                    \
+AVCodec ff_ ## name ## _decoder = {             \
     #name,                                      \
     AVMEDIA_TYPE_AUDIO,                         \
     id,                                         \

diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c
@@ -166,7 +166,7 @@ static int adx_decode_frame(AVCodecContext *avctx,
     return buf-buf0;
 }
 
-AVCodec adpcm_adx_decoder = {
+AVCodec ff_adpcm_adx_decoder = {
     "adpcm_adx",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ADPCM_ADX,

diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
@@ -183,7 +183,7 @@ static int adx_encode_frame(AVCodecContext *avctx,
     return dst-frame;
 }
 
-AVCodec adpcm_adx_encoder = {
+AVCodec ff_adpcm_adx_encoder = {
     "adpcm_adx",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ADPCM_ADX,

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
@@ -691,7 +691,7 @@ static av_cold int alac_decode_close(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec alac_decoder = {
+AVCodec ff_alac_decoder = {
     "alac",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ALAC,

diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c
@@ -523,7 +523,7 @@ static av_cold int alac_encode_close(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec alac_encoder = {
+AVCodec ff_alac_encoder = {
     "alac",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ALAC,

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
@@ -27,23 +27,23 @@
 #include "avcodec.h"
 
 #define REGISTER_HWACCEL(X,x) { \
-          extern AVHWAccel x##_hwaccel; \
-          if(CONFIG_##X##_HWACCEL) av_register_hwaccel(&x##_hwaccel); }
+          extern AVHWAccel ff_##x##_hwaccel; \
+          if(CONFIG_##X##_HWACCEL) av_register_hwaccel(&ff_##x##_hwaccel); }
 
 #define REGISTER_ENCODER(X,x) { \
-          extern AVCodec x##_encoder; \
-          if(CONFIG_##X##_ENCODER)  avcodec_register(&x##_encoder); }
+          extern AVCodec ff_##x##_encoder; \
+          if(CONFIG_##X##_ENCODER)  avcodec_register(&ff_##x##_encoder); }
 #define REGISTER_DECODER(X,x) { \
-          extern AVCodec x##_decoder; \
-          if(CONFIG_##X##_DECODER)  avcodec_register(&x##_decoder); }
+          extern AVCodec ff_##x##_decoder; \
+          if(CONFIG_##X##_DECODER)  avcodec_register(&ff_##x##_decoder); }
 #define REGISTER_ENCDEC(X,x)  REGISTER_ENCODER(X,x); REGISTER_DECODER(X,x)
 
 #define REGISTER_PARSER(X,x) { \
-          extern AVCodecParser x##_parser; \
-          if(CONFIG_##X##_PARSER)  av_register_codec_parser(&x##_parser); }
+          extern AVCodecParser ff_##x##_parser; \
+          if(CONFIG_##X##_PARSER)  av_register_codec_parser(&ff_##x##_parser); }
 #define REGISTER_BSF(X,x) { \
-          extern AVBitStreamFilter x##_bsf; \
-          if(CONFIG_##X##_BSF)     av_register_bitstream_filter(&x##_bsf); }
+          extern AVBitStreamFilter ff_##x##_bsf; \
+          if(CONFIG_##X##_BSF)     av_register_bitstream_filter(&ff_##x##_bsf); }
 
 void avcodec_register_all(void)
 {

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
@@ -1737,7 +1737,7 @@ static av_cold void flush(AVCodecContext *avctx)
 }
 
 
-AVCodec als_decoder = {
+AVCodec ff_als_decoder = {
     "als",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MP4ALS,

diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c
@@ -1036,7 +1036,7 @@ static int amrnb_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 }
 
 
-AVCodec amrnb_decoder = {
+AVCodec ff_amrnb_decoder = {
     .name           = "amrnb",
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = CODEC_ID_AMR_NB,

diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
@@ -1225,7 +1225,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     return expected_fr_size;
 }
 
-AVCodec amrwb_decoder = {
+AVCodec ff_amrwb_decoder = {
     .name           = "amrwb",
     .type           = CODEC_TYPE_AUDIO,
     .id             = CODEC_ID_AMR_WB,

diff --git a/libavcodec/anm.c b/libavcodec/anm.c
@@ -183,7 +183,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec anm_decoder = {
+AVCodec ff_anm_decoder = {
     "anm",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ANM,

diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c
@@ -422,7 +422,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec ansi_decoder = {
+AVCodec ff_ansi_decoder = {
     .name           = "ansi",
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_ANSI,

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
@@ -883,7 +883,7 @@ static void ape_flush(AVCodecContext *avctx)
     s->samples= 0;
 }
 
-AVCodec ape_decoder = {
+AVCodec ff_ape_decoder = {
     "ape",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_APE,

diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c
@@ -52,7 +52,7 @@ static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,
     return avpkt->size;
 }
 
-AVCodec ass_decoder = {
+AVCodec ff_ass_decoder = {
     .name         = "ass",
     .long_name    = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"),
     .type         = AVMEDIA_TYPE_SUBTITLE,

diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c
@@ -57,7 +57,7 @@ static int ass_encode_frame(AVCodecContext *avctx,
     return total_len;
 }
 
-AVCodec ass_encoder = {
+AVCodec ff_ass_encoder = {
     .name         = "ass",
     .long_name    = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"),
     .type         = AVMEDIA_TYPE_SUBTITLE,

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
@@ -613,7 +613,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
     return 0;
 }
 
-AVCodec asv1_decoder = {
+AVCodec ff_asv1_decoder = {
     "asv1",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ASV1,
@@ -626,7 +626,7 @@ AVCodec asv1_decoder = {
     .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"),
 };
 
-AVCodec asv2_decoder = {
+AVCodec ff_asv2_decoder = {
     "asv2",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ASV2,
@@ -640,7 +640,7 @@ AVCodec asv2_decoder = {
 };
 
 #if CONFIG_ASV1_ENCODER
-AVCodec asv1_encoder = {
+AVCodec ff_asv1_encoder = {
     "asv1",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ASV1,
@@ -654,7 +654,7 @@ AVCodec asv1_encoder = {
 #endif
 
 #if CONFIG_ASV2_ENCODER
-AVCodec asv2_encoder = {
+AVCodec ff_asv2_encoder = {
     "asv2",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ASV2,

diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c
@@ -365,7 +365,7 @@ static av_cold int atrac1_decode_end(AVCodecContext * avctx) {
 }
 
 
-AVCodec atrac1_decoder = {
+AVCodec ff_atrac1_decoder = {
     .name = "atrac1",
     .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_ATRAC1,

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
@@ -1019,7 +1019,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
 }
 
 
-AVCodec atrac3_decoder =
+AVCodec ff_atrac3_decoder =
 {
     .name = "atrac3",
     .type = AVMEDIA_TYPE_AUDIO,

diff --git a/libavcodec/aura.c b/libavcodec/aura.c
@@ -122,7 +122,7 @@ static av_cold int aura_decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec aura2_decoder = {
+AVCodec ff_aura2_decoder = {
     "aura2",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_AURA2,

diff --git a/libavcodec/avs.c b/libavcodec/avs.c
@@ -150,7 +150,7 @@ static av_cold int avs_decode_init(AVCodecContext * avctx)
     return 0;
 }
 
-AVCodec avs_decoder = {
+AVCodec ff_avs_decoder = {
     "avs",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_AVS,

diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
@@ -130,7 +130,7 @@ static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec bethsoftvid_decoder = {
+AVCodec ff_bethsoftvid_decoder = {
     .name = "bethsoftvid",
     .type = AVMEDIA_TYPE_VIDEO,
     .id = CODEC_ID_BETHSOFTVID,