diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-03 19:49:19 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-03 19:49:19 +0300 |
| commit | f3af379b5c1816271b1afce0ccb2a935dc29940c (patch) | |
| tree | 629aec01a415bfe4a0552d31292adbb01b31d180 /libavcodec/mpegvideo_enc.c | |
| parent | 908d010b12fadc36d8cadf6bba5e073e23b9603c (diff) | |
| parent | 2862b63783b5556f7f3fb2d097629bc6879f833a (diff) | |
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/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index fde3fd8cf9..a7e3206737 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1077,6 +1077,9 @@ FF_ENABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS if (avctx->brd_scale) s->brd_scale = avctx->brd_scale; + + if (avctx->prediction_method) + s->pred = avctx->prediction_method + 1; FF_ENABLE_DEPRECATION_WARNINGS #endif @@ -3888,7 +3891,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) case FMT_MJPEG: if (CONFIG_MJPEG_ENCODER) ff_mjpeg_encode_picture_header(s->avctx, &s->pb, &s->intra_scantable, - s->intra_matrix, s->chroma_intra_matrix); + s->pred, s->intra_matrix, s->chroma_intra_matrix); break; case FMT_H261: if (CONFIG_H261_ENCODER) |