diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-03 16:54:20 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-03 16:54:20 +0000 |
| commit | 730d2aabacd679fd44f770959877b3c6a5d80f0e (patch) | |
| tree | 941c1c5021576538835d7f84ad13268d64fbdd71 /libavcodec/mpegvideo_enc.c | |
| parent | 43c0298208ad6fe36a4dbf03824842d89c3ed143 (diff) | |
| parent | 0e9c4fe254073b209970df3e3cb84531bc388e99 (diff) | |
Merge commit '0e9c4fe254073b209970df3e3cb84531bc388e99'
* commit '0e9c4fe254073b209970df3e3cb84531bc388e99':
lavc: Move pre_me 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 1e0d33d266..297ff78840 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -355,6 +355,8 @@ FF_DISABLE_DEPRECATION_WARNINGS s->rtp_payload_size = avctx->rtp_payload_size; if (avctx->me_penalty_compensation) s->me_penalty_compensation = avctx->me_penalty_compensation; + if (avctx->pre_me) + s->me_pre = avctx->pre_me; FF_ENABLE_DEPRECATION_WARNINGS #endif @@ -3734,7 +3736,8 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->lambda = (s->lambda * s->me_penalty_compensation + 128) >> 8; s->lambda2 = (s->lambda2 * (int64_t) s->me_penalty_compensation + 128) >> 8; if (s->pict_type != AV_PICTURE_TYPE_B) { - if((s->avctx->pre_me && s->last_non_b_pict_type==AV_PICTURE_TYPE_I) || s->avctx->pre_me==2){ + if ((s->me_pre && s->last_non_b_pict_type == AV_PICTURE_TYPE_I) || + s->me_pre == 2) { s->avctx->execute(s->avctx, pre_estimate_motion_thread, &s->thread_context[0], NULL, context_count, sizeof(void*)); } } |