diff options
| author | Sean McGovern <gseanmcg@gmail.com> | 2013-07-04 18:02:17 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-07-04 18:02:17 +0200 |
| commit | bf18abb2eb79c00c69f6f83ede64536e3297793c (patch) | |
| tree | a636651d2e3c8cc91675655c4ac78aa49e4de95d /libavcodec/libx264.c | |
| parent | f32b8130f434fd33317c73f947514854ce466206 (diff) | |
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>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, }; |