From 0e9c4fe254073b209970df3e3cb84531bc388e99 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 9 Nov 2015 03:15:06 +0100 Subject: lavc: Move pre_me to codec private options This option is only used by mpegvideoenc. It is a very codec-specific option, so deprecate the global variant. Signed-off-by: Vittorio Giovara --- libavcodec/mpegvideo_enc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavcodec/mpegvideo_enc.c') diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 213367a84e..d16e408c84 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -300,6 +300,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 @@ -3465,7 +3467,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*)); } } -- cgit v1.2.3