diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-30 13:46:27 +0200 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-30 13:47:45 +0200 |
commit | 0915b531bc62440914710d2989813563b0446c5e (patch) | |
tree | 18517eb6ab7c0a88bf0e1de93b24ba638a6a5a89 | |
parent | 742b9617698f189e5bd911a600e6547b21bf6699 (diff) | |
download | ffmpeg-0915b531bc62440914710d2989813563b0446c5e.tar.gz |
Rename "AVClass class" as "AVClass component_class".
The aix header math.h defines "extern int class()" for C.
-rw-r--r-- | libavcodec/cljr.c | 4 | ||||
-rw-r--r-- | libavcodec/dnxhdenc.c | 4 | ||||
-rw-r--r-- | libavcodec/dvdsubdec.c | 4 | ||||
-rw-r--r-- | libavcodec/ffv1enc.c | 4 | ||||
-rw-r--r-- | libavcodec/g726.c | 4 | ||||
-rw-r--r-- | libavcodec/jpeg2000dec.c | 4 | ||||
-rw-r--r-- | libavcodec/rawdec.c | 4 | ||||
-rw-r--r-- | libavformat/flvdec.c | 4 | ||||
-rw-r--r-- | libavformat/gsmdec.c | 4 | ||||
-rw-r--r-- | libavformat/mov.c | 4 | ||||
-rw-r--r-- | libavformat/spdifenc.c | 4 | ||||
-rw-r--r-- | libavutil/eval.c | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index 2120864675..cf004b4524 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -168,7 +168,7 @@ static const AVOption options[] = { { NULL }, }; -static const AVClass class = { +static const AVClass cljr_class = { .class_name = "cljr encoder", .item_name = av_default_item_name, .option = options, @@ -185,6 +185,6 @@ AVCodec ff_cljr_encoder = { .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P, AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), - .priv_class = &class, + .priv_class = &cljr_class, }; #endif diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 3b11183e0f..0af948e78b 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -43,7 +43,7 @@ static const AVOption options[]={ {NULL} }; -static const AVClass class = { +static const AVClass dnxhd_class = { .class_name = "dnxhd", .item_name = av_default_item_name, .option = options, @@ -1049,6 +1049,6 @@ AVCodec ff_dnxhd_encoder = { AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), - .priv_class = &class, + .priv_class = &dnxhd_class, .defaults = dnxhd_defaults, }; diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 38af768639..19c31dc3c7 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -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 }, { NULL } }; -static const AVClass class = { +static const AVClass dvdsub_class = { .class_name = "dvdsubdec", .item_name = av_default_item_name, .option = options, @@ -606,5 +606,5 @@ AVCodec ff_dvdsub_decoder = { .init = dvdsub_init, .decode = dvdsub_decode, .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), - .priv_class = &class, + .priv_class = &dvdsub_class, }; diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 2e58f952cb..128eeb269d 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1135,7 +1135,7 @@ static const AVOption options[] = { { NULL } }; -static const AVClass class = { +static const AVClass ffv1_class = { .class_name = "ffv1 encoder", .item_name = av_default_item_name, .option = options, @@ -1169,5 +1169,5 @@ AVCodec ff_ffv1_encoder = { }, .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), .defaults = ffv1_defaults, - .priv_class = &class, + .priv_class = &ffv1_class, }; diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 58d046817c..7884f36189 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -368,7 +368,7 @@ static const AVOption options[] = { { NULL }, }; -static const AVClass class = { +static const AVClass g726_class = { .class_name = "g726", .item_name = av_default_item_name, .option = options, @@ -391,7 +391,7 @@ AVCodec ff_adpcm_g726_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), - .priv_class = &class, + .priv_class = &g726_class, .defaults = defaults, }; #endif diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index dc976c15fb..f449b585df 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1434,7 +1434,7 @@ static const AVProfile profiles[] = { { FF_PROFILE_UNKNOWN }, }; -static const AVClass class = { +static const AVClass jpeg2000_class = { .class_name = "jpeg2000", .item_name = av_default_item_name, .option = options, @@ -1450,7 +1450,7 @@ AVCodec ff_jpeg2000_decoder = { .priv_data_size = sizeof(Jpeg2000DecoderContext), .init_static_data = jpeg2000_init_static_data, .decode = jpeg2000_decode_frame, - .priv_class = &class, + .priv_class = &jpeg2000_class, .max_lowres = 5, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index ab3e0c7f00..4da212fed9 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -48,7 +48,7 @@ static const AVOption options[]={ {NULL} }; -static const AVClass class = { +static const AVClass rawdec_class = { .class_name = "rawdec", .option = options, .version = LIBAVUTIL_VERSION_INT, @@ -351,5 +351,5 @@ AVCodec ff_rawvideo_decoder = { .close = raw_close_decoder, .decode = raw_decode, .long_name = NULL_IF_CONFIG_SMALL("raw video"), - .priv_class = &class, + .priv_class = &rawdec_class, }; diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d13238f116..69e2bee331 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -911,7 +911,7 @@ static const AVOption options[] = { { NULL } }; -static const AVClass class = { +static const AVClass flv_class = { .class_name = "flvdec", .item_name = av_default_item_name, .option = options, @@ -928,5 +928,5 @@ AVInputFormat ff_flv_demuxer = { .read_seek = flv_read_seek, .read_close = flv_read_close, .extensions = "flv", - .priv_class = &class, + .priv_class = &flv_class, }; diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c index 9899266173..a51822ad23 100644 --- a/libavformat/gsmdec.c +++ b/libavformat/gsmdec.c @@ -80,7 +80,7 @@ static const AVOption options[] = { { NULL }, }; -static const AVClass class = { +static const AVClass gsm_class = { .class_name = "gsm demuxer", .item_name = av_default_item_name, .option = options, @@ -96,5 +96,5 @@ AVInputFormat ff_gsm_demuxer = { .flags = AVFMT_GENERIC_INDEX, .extensions = "gsm", .raw_codec_id = AV_CODEC_ID_GSM, - .priv_class = &class, + .priv_class = &gsm_class, }; diff --git a/libavformat/mov.c b/libavformat/mov.c index 36b17c1710..37030a57e2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3414,7 +3414,7 @@ static const AVOption options[] = { {NULL} }; -static const AVClass class = { +static const AVClass mov_class = { .class_name = "mov,mp4,m4a,3gp,3g2,mj2", .item_name = av_default_item_name, .option = options, @@ -3430,6 +3430,6 @@ AVInputFormat ff_mov_demuxer = { .read_packet = mov_read_packet, .read_close = mov_read_close, .read_seek = mov_read_seek, - .priv_class = &class, + .priv_class = &mov_class, .flags = AVFMT_NO_BYTE_SEEK, }; diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 857c20de22..17501f8cb4 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -92,7 +92,7 @@ static const AVOption options[] = { { NULL }, }; -static const AVClass class = { +static const AVClass spdif_class = { .class_name = "spdif", .item_name = av_default_item_name, .option = options, @@ -552,5 +552,5 @@ AVOutputFormat ff_spdif_muxer = { .write_packet = spdif_write_packet, .write_trailer = spdif_write_trailer, .flags = AVFMT_NOTIMESTAMPS, - .priv_class = &class, + .priv_class = &spdif_class, }; diff --git a/libavutil/eval.c b/libavutil/eval.c index 3abc3e5a88..9b1458c89b 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -52,7 +52,7 @@ typedef struct Parser { double *var; } 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] = { ['y'-'E']= -24, @@ -657,7 +657,7 @@ int av_expr_parse(AVExpr **expr, const char *s, if (!av_isspace(*s++)) *wp++ = s[-1]; *wp++ = 0; - p.class = &class; + p.class = &eval_class; p.stack_index=100; p.s= w; p.const_names = const_names; |