diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 21:18:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 21:18:17 +0200 |
commit | b00e56bec5f8aea788f3565cec09bcfea0aa4a53 (patch) | |
tree | 2a69a4813dee01269febde30bf5bcdc2c14e9452 /libavformat | |
parent | 247425241cb3b2b76df1c2aced5ce0d56126b82d (diff) | |
parent | f803e0dc0e75997ecb696521cd68d8aeb3cdac40 (diff) |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Support compilation on aix with gcc.
Rename "AVClass class" as "AVClass component_class".
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
Rename constant HZ in af_biquads.c as HERTZ.
Drop local lable from ppc asm timer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/flvdec.c | 4 | ||||
-rw-r--r-- | libavformat/gsmdec.c | 4 | ||||
-rw-r--r-- | libavformat/mov.c | 4 | ||||
-rw-r--r-- | libavformat/spdifenc.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d13238f116..69e2bee331 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -911,7 +911,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, @@ -928,5 +928,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 9899266173..a51822ad23 100644 --- a/libavformat/gsmdec.c +++ b/libavformat/gsmdec.c @@ -80,7 +80,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, @@ -96,5 +96,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/mov.c b/libavformat/mov.c index 36b17c1710..37030a57e2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3414,7 +3414,7 @@ static const AVOption options[] = { {NULL} }; -static const AVClass class = { +static const AVClass mov_class = { .class_name = "mov,mp4,m4a,3gp,3g2,mj2", .item_name = av_default_item_name, .option = options, @@ -3430,6 +3430,6 @@ AVInputFormat ff_mov_demuxer = { .read_packet = mov_read_packet, .read_close = mov_read_close, .read_seek = mov_read_seek, - .priv_class = &class, + .priv_class = &mov_class, .flags = AVFMT_NO_BYTE_SEEK, }; diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 857c20de22..17501f8cb4 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, @@ -552,5 +552,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, }; |