This avoids symbol collisions with AIX math libraries and use of
a reserved C++ keyword.
---
libavcodec/dnxhdenc.c | 4 ++--
libavcodec/ffv1enc.c | 4 ++--
libavcodec/g726.c | 4 ++--
libavcodec/jpeg2000dec.c | 4 ++--
libavcodec/libopencore-amr.c | 4 ++--
libavcodec/libopenjpegdec.c | 4 ++--
libavcodec/libopenjpegenc.c | 4 ++--
libavcodec/libspeexenc.c | 4 ++--
libavcodec/libvo-amrwbenc.c | 4 ++--
libavcodec/libvorbis.c | 4 ++--
libavcodec/libx264.c | 4 ++--
libavcodec/libxavs.c | 4 ++--
libavfilter/vf_fps.c | 4 ++--
libavfilter/vf_interlace.c | 4 ++--
libavformat/flvdec.c | 4 ++--
libavformat/gsmdec.c | 4 ++--
libavformat/spdifenc.c | 4 ++--
libavutil/cpu.c | 4 ++--
libavutil/eval.c | 4 ++--
19 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index c834ec3..b869247 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -41,7 +41,7 @@ static const AVOption options[]={
{"nitris_compat", "encode with Avid Nitris compatibility",
offsetof(DNXHDEncContext, nitris_compat), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1,
VE},
{NULL}
};
-static const AVClass class = { "dnxhd", av_default_item_name, options,
LIBAVUTIL_VERSION_INT };
+static const AVClass dnxhd_class = { "dnxhd", av_default_item_name, options,
LIBAVUTIL_VERSION_INT };
#define LAMBDA_FRAC_BITS 10
@@ -1031,5 +1031,5 @@ 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,
};
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index b0c79b9..74717c4 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1062,7 +1062,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,
@@ -1098,5 +1098,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 6db00fe..3c16994 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -370,7 +370,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,
@@ -393,7 +393,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 48fd98d..e3e2587 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1479,7 +1479,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,
@@ -1495,6 +1495,6 @@ 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,
.profiles = NULL_IF_CONFIG_SMALL(profiles)
};
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index 1f71a5b..c331006 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -181,7 +181,7 @@ static const AVOption options[] = {
{ NULL }
};
-static const AVClass class = {
+static const AVClass amrnb_class = {
"libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT
};
@@ -294,7 +294,7 @@ AVCodec ff_libopencore_amrnb_encoder = {
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive
Multi-Rate Narrow-Band)"),
- .priv_class = &class,
+ .priv_class = &amrnb_class,
};
#endif /* CONFIG_LIBOPENCORE_AMRNB_ENCODER */
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 9ff1429..4410d7e 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -419,7 +419,7 @@ static const AVOption options[] = {
{ NULL },
};
-static const AVClass class = {
+static const AVClass openjpeg_class = {
.class_name = "libopenjpeg",
.item_name = av_default_item_name,
.option = options,
@@ -435,5 +435,5 @@ AVCodec ff_libopenjpeg_decoder = {
.decode = libopenjpeg_decode_frame,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
- .priv_class = &class,
+ .priv_class = &openjpeg_class,
};
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index 09b115b..1361503 100644
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -404,7 +404,7 @@ static const AVOption options[] = {
{ NULL },
};
-static const AVClass class = {
+static const AVClass openjpeg_class = {
.class_name = "libopenjpeg",
.item_name = av_default_item_name,
.option = options,
@@ -432,5 +432,5 @@ AVCodec ff_libopenjpeg_encoder = {
AV_PIX_FMT_NONE
},
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
- .priv_class = &class,
+ .priv_class = &openjpeg_class,
};
diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c
index 9469a76..0925888 100644
--- a/libavcodec/libspeexenc.c
+++ b/libavcodec/libspeexenc.c
@@ -335,7 +335,7 @@ static const AVOption options[] = {
{ NULL },
};
-static const AVClass class = {
+static const AVClass speex_class = {
.class_name = "libspeex",
.item_name = av_default_item_name,
.option = options,
@@ -364,6 +364,6 @@ AVCodec ff_libspeex_encoder = {
0 },
.supported_samplerates = (const int[]){ 8000, 16000, 32000, 0 },
.long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"),
- .priv_class = &class,
+ .priv_class = &speex_class,
.defaults = defaults,
};
diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c
index af6ddf4..3512d89 100644
--- a/libavcodec/libvo-amrwbenc.c
+++ b/libavcodec/libvo-amrwbenc.c
@@ -45,7 +45,7 @@ static const AVOption options[] = {
{ NULL }
};
-static const AVClass class = {
+static const AVClass amrwb_class = {
"libvo_amrwbenc", av_default_item_name, options, LIBAVUTIL_VERSION_INT
};
@@ -150,5 +150,5 @@ AVCodec ff_libvo_amrwbenc_encoder = {
AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB "
"(Adaptive Multi-Rate Wide-Band)"),
- .priv_class = &class,
+ .priv_class = &amrwb_class,
};
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index 8e02057..5ae09e1 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -72,7 +72,7 @@ static const AVCodecDefault defaults[] = {
{ NULL },
};
-static const AVClass class = { "libvorbis", av_default_item_name, options,
LIBAVUTIL_VERSION_INT };
+static const AVClass vorbis_class = { "libvorbis", av_default_item_name,
options, LIBAVUTIL_VERSION_INT };
static int vorbis_error_to_averror(int ov_err)
@@ -347,6 +347,6 @@ AVCodec ff_libvorbis_encoder = {
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("libvorbis Vorbis"),
- .priv_class = &class,
+ .priv_class = &vorbis_class,
.defaults = defaults,
};
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index bb92110..728549d 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -549,7 +549,7 @@ static const AVOption options[] = {
{ NULL },
};
-static const AVClass class = {
+static const AVClass x264_class = {
.class_name = "libx264",
.item_name = av_default_item_name,
.option = options,
@@ -594,7 +594,7 @@ AVCodec ff_libx264_encoder = {
.close = X264_close,
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC
/ MPEG-4 part 10"),
- .priv_class = &class,
+ .priv_class = &x264_class,
.defaults = x264_defaults,
.init_static_data = X264_init_static,
};
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c
index 16026ac..3bc2976 100644
--- a/libavcodec/libxavs.c
+++ b/libavcodec/libxavs.c
@@ -406,7 +406,7 @@ static const AVOption options[] = {
{ NULL },
};
-static const AVClass class = {
+static const AVClass xavs_class = {
.class_name = "libxavs",
.item_name = av_default_item_name,
.option = options,
@@ -429,6 +429,6 @@ AVCodec ff_libxavs_encoder = {
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("libxavs Chinese AVS (Audio Video
Standard)"),
- .priv_class = &class,
+ .priv_class = &xavs_class,
.defaults = xavs_defaults,
};
diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index 7f51752..a3841cd 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -57,7 +57,7 @@ static const AVOption options[] = {
{ NULL },
};
-static const AVClass class = {
+static const AVClass fps_class = {
.class_name = "FPS filter",
.item_name = av_default_item_name,
.option = options,
@@ -281,7 +281,7 @@ AVFilter avfilter_vf_fps = {
.uninit = uninit,
.priv_size = sizeof(FPSContext),
- .priv_class = &class,
+ .priv_class = &fps_class,
.inputs = avfilter_vf_fps_inputs,
.outputs = avfilter_vf_fps_outputs,
diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c
index ff54896..50ce2a3 100755
--- a/libavfilter/vf_interlace.c
+++ b/libavfilter/vf_interlace.c
@@ -63,7 +63,7 @@ static const AVOption options[] = {
{ NULL }
};
-static const AVClass class = {
+static const AVClass interlace_class = {
.class_name = "interlace filter",
.item_name = av_default_item_name,
.option = options,
@@ -242,7 +242,7 @@ AVFilter avfilter_vf_interlace = {
.description = NULL_IF_CONFIG_SMALL("Convert progressive video into
interlaced."),
.uninit = uninit,
- .priv_class = &class,
+ .priv_class = &interlace_class,
.priv_size = sizeof(InterlaceContext),
.query_formats = query_formats,
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 2f68653..ab2d044 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -881,7 +881,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,
@@ -898,5 +898,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 f9ecbaf..45d448d 100644
--- a/libavformat/gsmdec.c
+++ b/libavformat/gsmdec.c
@@ -81,7 +81,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,
@@ -97,5 +97,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/spdifenc.c b/libavformat/spdifenc.c
index 1f37340..3afda64 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,
@@ -553,5 +553,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/cpu.c b/libavutil/cpu.c
index 6384d6d..ea3471b 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -112,7 +112,7 @@ int av_parse_cpu_flags(const char *s)
#endif
{ NULL },
};
- static const AVClass class = {
+ static const AVClass cpuflags_class = {
.class_name = "cpuflags",
.item_name = av_default_item_name,
.option = cpuflags_opts,
@@ -120,7 +120,7 @@ int av_parse_cpu_flags(const char *s)
};
int flags = 0, ret;
- const AVClass *pclass = &class;
+ const AVClass *pclass = &cpuflags_class;
if ((ret = av_opt_eval_flags(&pclass, &cpuflags_opts[0], s, &flags)) < 0)
return ret;
diff --git a/libavutil/eval.c b/libavutil/eval.c
index 0ca7472..9e3b185 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -50,7 +50,7 @@ typedef struct Parser {
double var[VARS];
} 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,
@@ -507,7 +507,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;
--
1.8.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
