diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:14:34 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:25:21 +0300 |
commit | dbf172e6f44d1736d27a84fa117dcd6b8460bd4b (patch) | |
tree | 673fee9ea042991f7ce1891389f3426efcf21c61 /libavcodec | |
parent | 1189af429211ac650aac730368a6cf5b23756605 (diff) | |
parent | f1fa1eed2abdc8dfb0af318a43f5d293b81141bd (diff) |
Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'
* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd':
mpegvideo: Expand macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/flvenc.c | 7 | ||||
-rw-r--r-- | libavcodec/h261enc.c | 7 | ||||
-rw-r--r-- | libavcodec/mjpegenc.c | 15 | ||||
-rw-r--r-- | libavcodec/mpegvideo.h | 8 | ||||
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 21 | ||||
-rw-r--r-- | libavcodec/rv10enc.c | 7 | ||||
-rw-r--r-- | libavcodec/rv20enc.c | 7 | ||||
-rw-r--r-- | libavcodec/wmv2enc.c | 7 |
8 files changed, 61 insertions, 18 deletions
diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index c1ff45056d..a2cd39955e 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -91,7 +91,12 @@ void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, } } -FF_MPV_GENERIC_CLASS(flv) +static const AVClass flv_class = { + .class_name = "flv encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_flv_encoder = { .name = "flv", diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 8ef272dbf0..f8eb1b0702 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -378,7 +378,12 @@ av_cold void ff_h261_encode_init(MpegEncContext *s) s->intra_ac_vlc_last_length = s->inter_ac_vlc_last_length = uni_h261_rl_len + 128*64; } -FF_MPV_GENERIC_CLASS(h261) +static const AVClass h261_class = { + .class_name = "h261 encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_h261_encoder = { .name = "h261", diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 2188725e26..c3ede0728d 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -252,7 +252,13 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, } #if CONFIG_MJPEG_ENCODER -FF_MPV_GENERIC_CLASS(mjpeg) + +static const AVClass mjpeg_class = { + .class_name = "mjpeg encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_mjpeg_encoder = { .name = "mjpeg", @@ -271,7 +277,12 @@ AVCodec ff_mjpeg_encoder = { }; #endif #if CONFIG_AMV_ENCODER -FF_MPV_GENERIC_CLASS(amv) +static const AVClass amv_class = { + .class_name = "amv encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_amv_encoder = { .name = "amv", diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 7a33824c71..13be43d047 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -596,14 +596,6 @@ typedef struct MpegEncContext { extern const AVOption ff_mpv_generic_options[]; -#define FF_MPV_GENERIC_CLASS(name) \ -static const AVClass name ## _class = {\ - .class_name = #name " encoder",\ - .item_name = av_default_item_name,\ - .option = ff_mpv_generic_options,\ - .version = LIBAVUTIL_VERSION_INT,\ -}; - /** * Set the given MpegEncContext to common defaults (same for encoding * and decoding). The changed fields will not depend upon the prior diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 2b6740fdbd..e729d36aa2 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4667,7 +4667,12 @@ AVCodec ff_h263p_encoder = { .priv_class = &h263p_class, }; -FF_MPV_GENERIC_CLASS(msmpeg4v2) +static const AVClass msmpeg4v2_class = { + .class_name = "msmpeg4v2 encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_msmpeg4v2_encoder = { .name = "msmpeg4v2", @@ -4682,7 +4687,12 @@ AVCodec ff_msmpeg4v2_encoder = { .priv_class = &msmpeg4v2_class, }; -FF_MPV_GENERIC_CLASS(msmpeg4v3) +static const AVClass msmpeg4v3_class = { + .class_name = "msmpeg4v3 encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_msmpeg4v3_encoder = { .name = "msmpeg4", @@ -4697,7 +4707,12 @@ AVCodec ff_msmpeg4v3_encoder = { .priv_class = &msmpeg4v3_class, }; -FF_MPV_GENERIC_CLASS(wmv1) +static const AVClass wmv1_class = { + .class_name = "wmv1 encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_wmv1_encoder = { .name = "wmv1", diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index 61fa15ed5d..b17acbc9b5 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -63,7 +63,12 @@ int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number) return 0; } -FF_MPV_GENERIC_CLASS(rv10) +static const AVClass rv10_class = { + .class_name = "rv10 encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_rv10_encoder = { .name = "rv10", diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index a42d413a0c..81fb4fc1ba 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -60,7 +60,12 @@ void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number){ } } -FF_MPV_GENERIC_CLASS(rv20) +static const AVClass rv20_class = { + .class_name = "rv20 encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_rv20_encoder = { .name = "rv20", diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 55ee089ed0..0499f0a1ed 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -213,7 +213,12 @@ void ff_wmv2_encode_mb(MpegEncContext *s, int16_t block[6][64], s->p_tex_bits += get_bits_diff(s); } -FF_MPV_GENERIC_CLASS(wmv2) +static const AVClass wmv2_class = { + .class_name = "wmv2 encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_wmv2_encoder = { .name = "wmv2", |