From bf18abb2eb79c00c69f6f83ede64536e3297793c Mon Sep 17 00:00:00 2001 From: Sean McGovern Date: Thu, 4 Jul 2013 18:02:17 +0200 Subject: 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 --- libavcodec/libx264.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/libx264.c') diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index f36d7f5ca2..0a1341263c 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, }; -- cgit v1.2.3