har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'

Browse Source 
* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd':
  mpegvideo: Expand macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-12 21:14:34 +02:00
commit dbf172e6f4
8 changed files with 61 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/flvenc.c
View File

@ -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 = { AVCodec ff_flv_encoder = {
.name = "flv", .name = "flv",

7
libavcodec/h261enc.c
View File

@ -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; 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 = { AVCodec ff_h261_encoder = {
.name = "h261", .name = "h261",

15
libavcodec/mjpegenc.c
View File

@ -252,7 +252,13 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
} }
#if CONFIG_MJPEG_ENCODER #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 = { AVCodec ff_mjpeg_encoder = {
.name = "mjpeg", .name = "mjpeg",
@ -271,7 +277,12 @@ AVCodec ff_mjpeg_encoder = {
}; };
#endif #endif
#if CONFIG_AMV_ENCODER #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 = { AVCodec ff_amv_encoder = {
.name = "amv", .name = "amv",

8
libavcodec/mpegvideo.h
View File

@ -596,14 +596,6 @@ typedef struct MpegEncContext {
extern const AVOption ff_mpv_generic_options[]; 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 * Set the given MpegEncContext to common defaults (same for encoding
* and decoding). The changed fields will not depend upon the prior * and decoding). The changed fields will not depend upon the prior

21
libavcodec/mpegvideo_enc.c
View File

@ -4667,7 +4667,12 @@ AVCodec ff_h263p_encoder = {
.priv_class = &h263p_class, .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 = { AVCodec ff_msmpeg4v2_encoder = {
.name = "msmpeg4v2", .name = "msmpeg4v2",
@ -4682,7 +4687,12 @@ AVCodec ff_msmpeg4v2_encoder = {
.priv_class = &msmpeg4v2_class, .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 = { AVCodec ff_msmpeg4v3_encoder = {
.name = "msmpeg4", .name = "msmpeg4",
@ -4697,7 +4707,12 @@ AVCodec ff_msmpeg4v3_encoder = {
.priv_class = &msmpeg4v3_class, .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 = { AVCodec ff_wmv1_encoder = {
.name = "wmv1", .name = "wmv1",

7
libavcodec/rv10enc.c
View File

@ -63,7 +63,12 @@ int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number)
return 0; 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 = { AVCodec ff_rv10_encoder = {
.name = "rv10", .name = "rv10",

7
libavcodec/rv20enc.c
View File

@ -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 = { AVCodec ff_rv20_encoder = {
.name = "rv20", .name = "rv20",

7
libavcodec/wmv2enc.c
View File

@ -213,7 +213,12 @@ void ff_wmv2_encode_mb(MpegEncContext *s, int16_t block[6][64],
s->p_tex_bits += get_bits_diff(s); 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 = { AVCodec ff_wmv2_encoder = {
.name = "wmv2", .name = "wmv2",