# HG changeset patch # User michael # Date 1164137864 0 # Node ID 8e0dcefcb46462db54a74ad41035453faac8efb1 # Parent e766498e81e9c52d539158852f17fa7f7d100ccc fix b frames + -mbd rd without -psnr (yes that was seriously buggy and probably hasnt been noticed as everyone who tested stuff used -psnr) diff -r e766498e81e9 -r 8e0dcefcb464 mpegvideo.c --- a/mpegvideo.c Tue Nov 21 19:35:06 2006 +0000 +++ b/mpegvideo.c Tue Nov 21 19:37:44 2006 +0000 @@ -3934,7 +3934,7 @@ 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];