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>tags/n2.0
| @@ -180,7 +180,7 @@ static const AVOption options[] = { | |||||
| { NULL } | { NULL } | ||||
| }; | }; | ||||
| static const AVClass class = { | |||||
| static const AVClass amrnb_class = { | |||||
| "libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT | "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, | .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, | ||||
| AV_SAMPLE_FMT_NONE }, | AV_SAMPLE_FMT_NONE }, | ||||
| .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), | .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 */ | #endif /* CONFIG_LIBOPENCORE_AMRNB_ENCODER */ | ||||
| @@ -392,7 +392,7 @@ static const AVOption options[] = { | |||||
| { NULL }, | { NULL }, | ||||
| }; | }; | ||||
| static const AVClass class = { | |||||
| static const AVClass openjpeg_class = { | |||||
| .class_name = "libopenjpeg", | .class_name = "libopenjpeg", | ||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| @@ -409,5 +409,5 @@ AVCodec ff_libopenjpeg_decoder = { | |||||
| .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, | .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, | ||||
| .max_lowres = 31, | .max_lowres = 31, | ||||
| .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), | .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), | ||||
| .priv_class = &class, | |||||
| .priv_class = &openjpeg_class, | |||||
| }; | }; | ||||
| @@ -542,7 +542,7 @@ static const AVOption options[] = { | |||||
| { NULL }, | { NULL }, | ||||
| }; | }; | ||||
| static const AVClass class = { | |||||
| static const AVClass openjpeg_class = { | |||||
| .class_name = "libopenjpeg", | .class_name = "libopenjpeg", | ||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| @@ -577,5 +577,5 @@ AVCodec ff_libopenjpeg_encoder = { | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }, | }, | ||||
| .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), | .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), | ||||
| .priv_class = &class, | |||||
| .priv_class = &openjpeg_class, | |||||
| }; | }; | ||||
| @@ -334,7 +334,7 @@ static const AVOption options[] = { | |||||
| { NULL }, | { NULL }, | ||||
| }; | }; | ||||
| static const AVClass class = { | |||||
| static const AVClass speex_class = { | |||||
| .class_name = "libspeex", | .class_name = "libspeex", | ||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| @@ -363,6 +363,6 @@ AVCodec ff_libspeex_encoder = { | |||||
| 0 }, | 0 }, | ||||
| .supported_samplerates = (const int[]){ 8000, 16000, 32000, 0 }, | .supported_samplerates = (const int[]){ 8000, 16000, 32000, 0 }, | ||||
| .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), | .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), | ||||
| .priv_class = &class, | |||||
| .priv_class = &speex_class, | |||||
| .defaults = defaults, | .defaults = defaults, | ||||
| }; | }; | ||||
| @@ -45,7 +45,7 @@ static const AVOption options[] = { | |||||
| { NULL } | { NULL } | ||||
| }; | }; | ||||
| static const AVClass class = { | |||||
| static const AVClass amrwb_class = { | |||||
| "libvo_amrwbenc", av_default_item_name, options, LIBAVUTIL_VERSION_INT | "libvo_amrwbenc", av_default_item_name, options, LIBAVUTIL_VERSION_INT | ||||
| }; | }; | ||||
| @@ -148,5 +148,5 @@ AVCodec ff_libvo_amrwbenc_encoder = { | |||||
| AV_SAMPLE_FMT_NONE }, | AV_SAMPLE_FMT_NONE }, | ||||
| .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB " | .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB " | ||||
| "(Adaptive Multi-Rate Wide-Band)"), | "(Adaptive Multi-Rate Wide-Band)"), | ||||
| .priv_class = &class, | |||||
| .priv_class = &amrwb_class, | |||||
| }; | }; | ||||
| @@ -64,7 +64,7 @@ static const AVCodecDefault defaults[] = { | |||||
| { NULL }, | { NULL }, | ||||
| }; | }; | ||||
| static const AVClass class = { | |||||
| static const AVClass vorbis_class = { | |||||
| .class_name = "libvorbis", | .class_name = "libvorbis", | ||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| @@ -373,6 +373,6 @@ AVCodec ff_libvorbis_encoder = { | |||||
| .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, | .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, | ||||
| AV_SAMPLE_FMT_NONE }, | AV_SAMPLE_FMT_NONE }, | ||||
| .long_name = NULL_IF_CONFIG_SMALL("libvorbis"), | .long_name = NULL_IF_CONFIG_SMALL("libvorbis"), | ||||
| .priv_class = &class, | |||||
| .priv_class = &vorbis_class, | |||||
| .defaults = defaults, | .defaults = defaults, | ||||
| }; | }; | ||||
| @@ -676,7 +676,7 @@ static const AVOption options[] = { | |||||
| { NULL }, | { NULL }, | ||||
| }; | }; | ||||
| static const AVClass class = { | |||||
| static const AVClass x264_class = { | |||||
| .class_name = "libx264", | .class_name = "libx264", | ||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| @@ -730,7 +730,7 @@ AVCodec ff_libx264_encoder = { | |||||
| .close = X264_close, | .close = X264_close, | ||||
| .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, | .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"), | .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, | .defaults = x264_defaults, | ||||
| .init_static_data = X264_init_static, | .init_static_data = X264_init_static, | ||||
| }; | }; | ||||
| @@ -404,7 +404,7 @@ static const AVOption options[] = { | |||||
| { NULL }, | { NULL }, | ||||
| }; | }; | ||||
| static const AVClass class = { | |||||
| static const AVClass xavs_class = { | |||||
| .class_name = "libxavs", | .class_name = "libxavs", | ||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| @@ -427,6 +427,6 @@ AVCodec ff_libxavs_encoder = { | |||||
| .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, | .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, | ||||
| .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, | .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)"), | .long_name = NULL_IF_CONFIG_SMALL("libxavs Chinese AVS (Audio Video Standard)"), | ||||
| .priv_class = &class, | |||||
| .priv_class = &xavs_class, | |||||
| .defaults = xavs_defaults, | .defaults = xavs_defaults, | ||||
| }; | }; | ||||