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/huffyuvenc.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/huffyuvenc.c')
| -rw-r--r-- | libavcodec/huffyuvenc.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index c70f1fee89..572de16a1f 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -319,7 +319,12 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->bits_per_coded_sample = s->bitstream_bpp; s->decorrelate = s->bitstream_bpp >= 24 && !s->yuv && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR); - s->predictor = avctx->prediction_method; +#if FF_API_PRIVATE_OPT +FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->prediction_method) + s->predictor = avctx->prediction_method; +FF_ENABLE_DEPRECATION_WARNINGS +#endif s->interlaced = avctx->flags & AV_CODEC_FLAG_INTERLACED_ME ? 1 : 0; if (s->context) { if (s->flags & (AV_CODEC_FLAG_PASS1 | AV_CODEC_FLAG_PASS2)) { @@ -1057,6 +1062,10 @@ static av_cold int encode_end(AVCodecContext *avctx) { "non_deterministic", "Allow multithreading for e.g. context=1 at the expense of determinism", \ OFFSET(non_determ), AV_OPT_TYPE_BOOL, { .i64 = 1 }, \ 0, 1, VE }, \ + { "pred", "Prediction method", OFFSET(predictor), AV_OPT_TYPE_INT, { .i64 = LEFT }, LEFT, MEDIAN, VE, "pred" }, \ + { "left", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = LEFT }, INT_MIN, INT_MAX, VE, "pred" }, \ + { "plane", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PLANE }, INT_MIN, INT_MAX, VE, "pred" }, \ + { "median", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MEDIAN }, INT_MIN, INT_MAX, VE, "pred" }, \ static const AVOption normal_options[] = { COMMON_OPTIONS |