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

Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.



None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: default avatarMans Rullgard <mans@mansr.com>
parent 2d162e38
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -109,7 +109,7 @@ static void scale_coefficients(AC3EncodeContext *s)
}
AVCodec ac3_encoder = {
AVCodec ff_ac3_encoder = {
"ac3",
AVMEDIA_TYPE_AUDIO,
CODEC_ID_AC3,
......
......@@ -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, \
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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)
{
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -180,7 +180,7 @@ static av_cold int bfi_decode_close(AVCodecContext * avctx)
return 0;
}
AVCodec bfi_decoder = {
AVCodec ff_bfi_decoder = {
.name = "bfi",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_BFI,
......
......@@ -1000,7 +1000,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
return 0;
}
AVCodec bink_decoder = {
AVCodec ff_bink_decoder = {
"binkvideo",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_BINKVIDEO,
......
......@@ -286,7 +286,7 @@ static int decode_frame(AVCodecContext *avctx,
return buf_size;
}
AVCodec binkaudio_rdft_decoder = {
AVCodec ff_binkaudio_rdft_decoder = {
"binkaudio_rdft",
AVMEDIA_TYPE_AUDIO,
CODEC_ID_BINKAUDIO_RDFT,
......@@ -298,7 +298,7 @@ AVCodec binkaudio_rdft_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)")
};
AVCodec binkaudio_dct_decoder = {
AVCodec ff_binkaudio_dct_decoder = {
"binkaudio_dct",
AVMEDIA_TYPE_AUDIO,
CODEC_ID_BINKAUDIO_DCT,
......
......@@ -335,7 +335,7 @@ static av_cold int bmp_decode_end(AVCodecContext *avctx)
return 0;
}
AVCodec bmp_decoder = {
AVCodec ff_bmp_decoder = {
"bmp",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_BMP,
......
......@@ -149,7 +149,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s
return n_bytes;
}
AVCodec bmp_encoder = {
AVCodec ff_bmp_encoder = {
"bmp",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_BMP,
......
......@@ -242,7 +242,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
return buf_size;
}
AVCodec c93_decoder = {
AVCodec ff_c93_decoder = {
"c93",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_C93,
......
......@@ -97,7 +97,7 @@ static int cavsvideo_parse(AVCodecParserContext *s,
return next;
}
AVCodecParser cavsvideo_parser = {
AVCodecParser ff_cavsvideo_parser = {
{ CODEC_ID_CAVS },
sizeof(ParseContext1),
NULL,
......
......@@ -709,7 +709,7 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size,
}
}
AVCodec cavs_decoder = {
AVCodec ff_cavs_decoder = {
"cavs",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_CAVS,
......
......@@ -367,7 +367,7 @@ static av_cold int cdg_decode_end(AVCodecContext *avctx)
return 0;
}
AVCodec cdgraphics_decoder = {
AVCodec ff_cdgraphics_decoder = {
"cdgraphics",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_CDGRAPHICS,
......
......@@ -40,7 +40,7 @@ static int chomp_filter(AVBitStreamFilterContext *bsfc,
/**
* This filter removes a string of NULL bytes from the end of a packet.
*/
AVBitStreamFilter chomp_bsf = {
AVBitStreamFilter ff_chomp_bsf = {
"chomp",
0,
chomp_filter,
......
......@@ -455,7 +455,7 @@ static av_cold int cinepak_decode_end(AVCodecContext *avctx)
return 0;
}
AVCodec cinepak_decoder = {
AVCodec ff_cinepak_decoder = {
"cinepak",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_CINEPAK,
......
......@@ -140,7 +140,7 @@ static av_cold int encode_init(AVCodecContext *avctx){
}
#endif
AVCodec cljr_decoder = {
AVCodec ff_cljr_decoder = {
"cljr",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_CLJR,
......@@ -154,7 +154,7 @@ AVCodec cljr_decoder = {
};
#if CONFIG_CLJR_ENCODER
AVCodec cljr_encoder = {
AVCodec ff_cljr_encoder = {
"cljr",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_CLJR,
......
......@@ -1283,7 +1283,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
}
AVCodec cook_decoder =
AVCodec ff_cook_decoder =
{
.name = "cook",
.type = AVMEDIA_TYPE_AUDIO,
......
......@@ -254,7 +254,7 @@ static av_cold int decode_end(AVCodecContext *avctx) {
return 0;
}
AVCodec cscd_decoder = {
AVCodec ff_cscd_decoder = {
"camstudio",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_CSCD,
......
......@@ -178,7 +178,7 @@ static av_cold int cyuv_decode_end(AVCodecContext *avctx)
}
#if CONFIG_AURA_DECODER
AVCodec aura_decoder = {
AVCodec ff_aura_decoder = {
"aura",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_AURA,
......@@ -194,7 +194,7 @@ AVCodec aura_decoder = {
#endif
#if CONFIG_CYUV_DECODER
AVCodec cyuv_decoder = {
AVCodec ff_cyuv_decoder = {
"cyuv",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_CYUV,
......
......@@ -1875,7 +1875,7 @@ static const AVProfile profiles[] = {
{ FF_PROFILE_UNKNOWN },
};
AVCodec dca_decoder = {
AVCodec ff_dca_decoder = {
.name = "dca",
.type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_DTS,
......
......@@ -125,7 +125,7 @@ static int dca_parse(AVCodecParserContext * s,
return next;