diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-03 16:49:19 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-03 16:49:19 +0000 |
| commit | f3af379b5c1816271b1afce0ccb2a935dc29940c (patch) | |
| tree | 629aec01a415bfe4a0552d31292adbb01b31d180 /libavcodec/mjpegenc.c | |
| parent | 908d010b12fadc36d8cadf6bba5e073e23b9603c (diff) | |
| parent | 2862b63783b5556f7f3fb2d097629bc6879f833a (diff) | |
| download | ffmpeg-f3af379b5c1816271b1afce0ccb2a935dc29940c.tar.gz | |
Merge commit '2862b63783b5556f7f3fb2d097629bc6879f833a'
* commit '2862b63783b5556f7f3fb2d097629bc6879f833a':
lavc: Move prediction_method to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/mjpegenc.c')
| -rw-r--r-- | libavcodec/mjpegenc.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index f15de58c2c..b751d1402a 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -253,12 +253,24 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, return ret; } +#define OFFSET(x) offsetof(MpegEncContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { +FF_MPV_COMMON_OPTS +{ "pred", "Prediction method", OFFSET(pred), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 3, VE, "pred" }, + { "left", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "pred" }, + { "plane", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "pred" }, + { "median", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 3 }, INT_MIN, INT_MAX, VE, "pred" }, + +{ NULL}, +}; + #if CONFIG_MJPEG_ENCODER static const AVClass mjpeg_class = { .class_name = "mjpeg encoder", .item_name = av_default_item_name, - .option = ff_mpv_generic_options, + .option = options, .version = LIBAVUTIL_VERSION_INT, }; @@ -268,6 +280,7 @@ AVCodec ff_mjpeg_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MJPEG, .priv_data_size = sizeof(MpegEncContext), + .priv_class = &mjpeg_class, .init = ff_mpv_encode_init, .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, @@ -282,7 +295,7 @@ AVCodec ff_mjpeg_encoder = { static const AVClass amv_class = { .class_name = "amv encoder", .item_name = av_default_item_name, - .option = ff_mpv_generic_options, + .option = options, .version = LIBAVUTIL_VERSION_INT, }; |