From bf18abb2eb79c00c69f6f83ede64536e3297793c Mon Sep 17 00:00:00 2001
From: Sean McGovern <gseanmcg@gmail.com>
Date: Thu, 4 Jul 2013 18:02:17 +0200
Subject: [PATCH] Rename "AVClass class" as "AVClass component_class" for
external codecs.
The aix header math.h defines "extern int class()" for C.
This fixes compilation on aix with external libraries enabled.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
---
libavcodec/libopencore-amr.c | 4 ++--
libavcodec/libopenjpegdec.c | 4 ++--
libavcodec/libopenjpegenc.c | 4 ++--
libavcodec/libspeexenc.c | 4 ++--
libavcodec/libvo-amrwbenc.c | 4 ++--
libavcodec/libvorbisenc.c | 4 ++--
libavcodec/libx264.c | 4 ++--
libavcodec/libxavs.c | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index c991106abb1..391ac25ca4a 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -180,7 +180,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
};
@@ -291,7 +291,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 ec6e275dc95..c331b590e8e 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -392,7 +392,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,
@@ -409,5 +409,5 @@ AVCodec ff_libopenjpeg_decoder = {
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.max_lowres = 31,
.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 c35508376b6..51fc896c4b2 100644
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -542,7 +542,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,
@@ -577,5 +577,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 b96ca1ba556..5be5d69af14 100644
--- a/libavcodec/libspeexenc.c
+++ b/libavcodec/libspeexenc.c
@@ -334,7 +334,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,
@@ -363,6 +363,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 a068cd009d7..f12cfb67a83 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
};
@@ -148,5 +148,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/libvorbisenc.c b/libavcodec/libvorbisenc.c
index d3f86ccc59a..d7fded813f2 100644
--- a/libavcodec/libvorbisenc.c
+++ b/libavcodec/libvorbisenc.c
@@ -64,7 +64,7 @@ static const AVCodecDefault defaults[] = {
{ NULL },
};
-static const AVClass class = {
+static const AVClass vorbis_class = {
.class_name = "libvorbis",
.item_name = av_default_item_name,
.option = options,
@@ -373,6 +373,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"),
- .priv_class = &class,
+ .priv_class = &vorbis_class,
.defaults = defaults,
};
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index f36d7f5ca25..0a1341263c9 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -676,7 +676,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,
@@ -730,7 +730,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 442fc0eea48..fad0a546954 100644
--- a/libavcodec/libxavs.c
+++ b/libavcodec/libxavs.c
@@ -404,7 +404,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,
@@ -427,6 +427,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,
};
--
GitLab