git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avcodec: Rename ff_mpv_decode_mb() to ff_mpv_reconstruct_mb
[ffmpeg.git]
/
libavcodec
/
mpegvideo_enc.c
diff --git
a/libavcodec/mpegvideo_enc.c
b/libavcodec/mpegvideo_enc.c
index
1003dea
..
fffb113
100644
(file)
--- a/
libavcodec/mpegvideo_enc.c
+++ b/
libavcodec/mpegvideo_enc.c
@@
-2774,7
+2774,7
@@
static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegE
}
if(s->avctx->mb_decision == FF_MB_DECISION_RD){
}
if(s->avctx->mb_decision == FF_MB_DECISION_RD){
- ff_mpv_
decode
_mb(s, s->block);
+ ff_mpv_
reconstruct
_mb(s, s->block);
score *= s->lambda2;
score += sse_mb(s) << FF_LAMBDA_SHIFT;
score *= s->lambda2;
score += sse_mb(s) << FF_LAMBDA_SHIFT;
@@
-3479,7
+3479,7
@@
FF_ENABLE_DEPRECATION_WARNINGS
}
if(s->avctx->mb_decision == FF_MB_DECISION_BITS)
}
if(s->avctx->mb_decision == FF_MB_DECISION_BITS)
- ff_mpv_
decode
_mb(s, s->block);
+ ff_mpv_
reconstruct
_mb(s, s->block);
} else {
int motion_x = 0, motion_y = 0;
s->mv_type=MV_TYPE_16X16;
} else {
int motion_x = 0, motion_y = 0;
s->mv_type=MV_TYPE_16X16;
@@
-3598,7
+3598,7
@@
FF_ENABLE_DEPRECATION_WARNINGS
s->out_format == FMT_H263 && s->pict_type!=AV_PICTURE_TYPE_B)
ff_h263_update_motion_val(s);
s->out_format == FMT_H263 && s->pict_type!=AV_PICTURE_TYPE_B)
ff_h263_update_motion_val(s);
- ff_mpv_
decode
_mb(s, s->block);
+ ff_mpv_
reconstruct
_mb(s, s->block);
}
/* clean the MV table in IPS frames for direct mode in B-frames */
}
/* clean the MV table in IPS frames for direct mode in B-frames */