diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:14:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:25:21 +0200 |
| commit | dbf172e6f44d1736d27a84fa117dcd6b8460bd4b (patch) | |
| tree | 673fee9ea042991f7ce1891389f3426efcf21c61 /libavcodec/mjpegenc.c | |
| parent | 1189af429211ac650aac730368a6cf5b23756605 (diff) | |
| parent | f1fa1eed2abdc8dfb0af318a43f5d293b81141bd (diff) | |
| download | ffmpeg-dbf172e6f44d1736d27a84fa117dcd6b8460bd4b.tar.gz | |
Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'
* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd':
mpegvideo: Expand macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegenc.c')
| -rw-r--r-- | libavcodec/mjpegenc.c | 15 |
1 files changed, 13 insertions, 2 deletions
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", |