mirror of https://git.ffmpeg.org/ffmpeg.git
fix b frames + -mbd rd without -psnr (yes that was seriously buggy and probably hasnt been noticed as everyone who tested stuff used -psnr)
Originally committed as revision 7148 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
169bc475d1
commit
bb243e7100
|
@ -3934,7 +3934,7 @@ static always_inline void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM bloc
|
|||
else if (s->h263_pred || s->h263_aic)
|
||||
s->mbintra_table[mb_xy]=1;
|
||||
|
||||
if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) { //FIXME precalc
|
||||
if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==B_TYPE) && s->avctx->mb_decision != FF_MB_DECISION_RD)) { //FIXME precalc
|
||||
uint8_t *dest_y, *dest_cb, *dest_cr;
|
||||
int dct_linesize, dct_offset;
|
||||
op_pixels_func (*op_pix)[4];
|
||||
|
|
Loading…
Reference in New Issue