Commit 0915b531 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Rename "AVClass class" as "AVClass component_class".

The aix header math.h defines "extern int class()" for C.
parent 742b9617
...@@ -168,7 +168,7 @@ static const AVOption options[] = { ...@@ -168,7 +168,7 @@ static const AVOption options[] = {
{ NULL }, { NULL },
}; };
static const AVClass class = { static const AVClass cljr_class = {
.class_name = "cljr encoder", .class_name = "cljr encoder",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -185,6 +185,6 @@ AVCodec ff_cljr_encoder = { ...@@ -185,6 +185,6 @@ AVCodec ff_cljr_encoder = {
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
.priv_class = &class, .priv_class = &cljr_class,
}; };
#endif #endif
...@@ -43,7 +43,7 @@ static const AVOption options[]={ ...@@ -43,7 +43,7 @@ static const AVOption options[]={
{NULL} {NULL}
}; };
static const AVClass class = { static const AVClass dnxhd_class = {
.class_name = "dnxhd", .class_name = "dnxhd",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -1049,6 +1049,6 @@ AVCodec ff_dnxhd_encoder = { ...@@ -1049,6 +1049,6 @@ AVCodec ff_dnxhd_encoder = {
AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P10,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
.priv_class = &class, .priv_class = &dnxhd_class,
.defaults = dnxhd_defaults, .defaults = dnxhd_defaults,
}; };
...@@ -591,7 +591,7 @@ static const AVOption options[] = { ...@@ -591,7 +591,7 @@ static const AVOption options[] = {
{ "palette", "set the global palette", OFFSET(palette_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VD }, { "palette", "set the global palette", OFFSET(palette_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VD },
{ NULL } { NULL }
}; };
static const AVClass class = { static const AVClass dvdsub_class = {
.class_name = "dvdsubdec", .class_name = "dvdsubdec",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -606,5 +606,5 @@ AVCodec ff_dvdsub_decoder = { ...@@ -606,5 +606,5 @@ AVCodec ff_dvdsub_decoder = {
.init = dvdsub_init, .init = dvdsub_init,
.decode = dvdsub_decode, .decode = dvdsub_decode,
.long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
.priv_class = &class, .priv_class = &dvdsub_class,
}; };
...@@ -1135,7 +1135,7 @@ static const AVOption options[] = { ...@@ -1135,7 +1135,7 @@ static const AVOption options[] = {
{ NULL } { NULL }
}; };
static const AVClass class = { static const AVClass ffv1_class = {
.class_name = "ffv1 encoder", .class_name = "ffv1 encoder",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -1169,5 +1169,5 @@ AVCodec ff_ffv1_encoder = { ...@@ -1169,5 +1169,5 @@ AVCodec ff_ffv1_encoder = {
}, },
.long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
.defaults = ffv1_defaults, .defaults = ffv1_defaults,
.priv_class = &class, .priv_class = &ffv1_class,
}; };
...@@ -368,7 +368,7 @@ static const AVOption options[] = { ...@@ -368,7 +368,7 @@ static const AVOption options[] = {
{ NULL }, { NULL },
}; };
static const AVClass class = { static const AVClass g726_class = {
.class_name = "g726", .class_name = "g726",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -391,7 +391,7 @@ AVCodec ff_adpcm_g726_encoder = { ...@@ -391,7 +391,7 @@ AVCodec ff_adpcm_g726_encoder = {
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
.priv_class = &class, .priv_class = &g726_class,
.defaults = defaults, .defaults = defaults,
}; };
#endif #endif
......
...@@ -1434,7 +1434,7 @@ static const AVProfile profiles[] = { ...@@ -1434,7 +1434,7 @@ static const AVProfile profiles[] = {
{ FF_PROFILE_UNKNOWN }, { FF_PROFILE_UNKNOWN },
}; };
static const AVClass class = { static const AVClass jpeg2000_class = {
.class_name = "jpeg2000", .class_name = "jpeg2000",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -1450,7 +1450,7 @@ AVCodec ff_jpeg2000_decoder = { ...@@ -1450,7 +1450,7 @@ AVCodec ff_jpeg2000_decoder = {
.priv_data_size = sizeof(Jpeg2000DecoderContext), .priv_data_size = sizeof(Jpeg2000DecoderContext),
.init_static_data = jpeg2000_init_static_data, .init_static_data = jpeg2000_init_static_data,
.decode = jpeg2000_decode_frame, .decode = jpeg2000_decode_frame,
.priv_class = &class, .priv_class = &jpeg2000_class,
.max_lowres = 5, .max_lowres = 5,
.profiles = NULL_IF_CONFIG_SMALL(profiles) .profiles = NULL_IF_CONFIG_SMALL(profiles)
}; };
...@@ -48,7 +48,7 @@ static const AVOption options[]={ ...@@ -48,7 +48,7 @@ static const AVOption options[]={
{NULL} {NULL}
}; };
static const AVClass class = { static const AVClass rawdec_class = {
.class_name = "rawdec", .class_name = "rawdec",
.option = options, .option = options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
...@@ -351,5 +351,5 @@ AVCodec ff_rawvideo_decoder = { ...@@ -351,5 +351,5 @@ AVCodec ff_rawvideo_decoder = {
.close = raw_close_decoder, .close = raw_close_decoder,
.decode = raw_decode, .decode = raw_decode,
.long_name = NULL_IF_CONFIG_SMALL("raw video"), .long_name = NULL_IF_CONFIG_SMALL("raw video"),
.priv_class = &class, .priv_class = &rawdec_class,
}; };
...@@ -911,7 +911,7 @@ static const AVOption options[] = { ...@@ -911,7 +911,7 @@ static const AVOption options[] = {
{ NULL } { NULL }
}; };
static const AVClass class = { static const AVClass flv_class = {
.class_name = "flvdec", .class_name = "flvdec",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -928,5 +928,5 @@ AVInputFormat ff_flv_demuxer = { ...@@ -928,5 +928,5 @@ AVInputFormat ff_flv_demuxer = {
.read_seek = flv_read_seek, .read_seek = flv_read_seek,
.read_close = flv_read_close, .read_close = flv_read_close,
.extensions = "flv", .extensions = "flv",
.priv_class = &class, .priv_class = &flv_class,
}; };
...@@ -80,7 +80,7 @@ static const AVOption options[] = { ...@@ -80,7 +80,7 @@ static const AVOption options[] = {
{ NULL }, { NULL },
}; };
static const AVClass class = { static const AVClass gsm_class = {
.class_name = "gsm demuxer", .class_name = "gsm demuxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -96,5 +96,5 @@ AVInputFormat ff_gsm_demuxer = { ...@@ -96,5 +96,5 @@ AVInputFormat ff_gsm_demuxer = {
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "gsm", .extensions = "gsm",
.raw_codec_id = AV_CODEC_ID_GSM, .raw_codec_id = AV_CODEC_ID_GSM,
.priv_class = &class, .priv_class = &gsm_class,
}; };
...@@ -3414,7 +3414,7 @@ static const AVOption options[] = { ...@@ -3414,7 +3414,7 @@ static const AVOption options[] = {
{NULL} {NULL}
}; };
static const AVClass class = { static const AVClass mov_class = {
.class_name = "mov,mp4,m4a,3gp,3g2,mj2", .class_name = "mov,mp4,m4a,3gp,3g2,mj2",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -3430,6 +3430,6 @@ AVInputFormat ff_mov_demuxer = { ...@@ -3430,6 +3430,6 @@ AVInputFormat ff_mov_demuxer = {
.read_packet = mov_read_packet, .read_packet = mov_read_packet,
.read_close = mov_read_close, .read_close = mov_read_close,
.read_seek = mov_read_seek, .read_seek = mov_read_seek,
.priv_class = &class, .priv_class = &mov_class,
.flags = AVFMT_NO_BYTE_SEEK, .flags = AVFMT_NO_BYTE_SEEK,
}; };
...@@ -92,7 +92,7 @@ static const AVOption options[] = { ...@@ -92,7 +92,7 @@ static const AVOption options[] = {
{ NULL }, { NULL },
}; };
static const AVClass class = { static const AVClass spdif_class = {
.class_name = "spdif", .class_name = "spdif",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
...@@ -552,5 +552,5 @@ AVOutputFormat ff_spdif_muxer = { ...@@ -552,5 +552,5 @@ AVOutputFormat ff_spdif_muxer = {
.write_packet = spdif_write_packet, .write_packet = spdif_write_packet,
.write_trailer = spdif_write_trailer, .write_trailer = spdif_write_trailer,
.flags = AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
.priv_class = &class, .priv_class = &spdif_class,
}; };
...@@ -52,7 +52,7 @@ typedef struct Parser { ...@@ -52,7 +52,7 @@ typedef struct Parser {
double *var; double *var;
} Parser; } Parser;
static const AVClass class = { "Eval", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(Parser,log_offset), offsetof(Parser,log_ctx) }; static const AVClass eval_class = { "Eval", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(Parser,log_offset), offsetof(Parser,log_ctx) };
static const int8_t si_prefixes['z' - 'E' + 1] = { static const int8_t si_prefixes['z' - 'E' + 1] = {
['y'-'E']= -24, ['y'-'E']= -24,
...@@ -657,7 +657,7 @@ int av_expr_parse(AVExpr **expr, const char *s, ...@@ -657,7 +657,7 @@ int av_expr_parse(AVExpr **expr, const char *s,
if (!av_isspace(*s++)) *wp++ = s[-1]; if (!av_isspace(*s++)) *wp++ = s[-1];
*wp++ = 0; *wp++ = 0;
p.class = &class; p.class = &eval_class;
p.stack_index=100; p.stack_index=100;
p.s= w; p.s= w;
p.const_names = const_names; p.const_names = const_names;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment