Mercurial > libavcodec.hg

diff mpegvideo.c @ 4224:8e0dcefcb464 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix b frames + -mbd rd without -psnr (yes that was seriously buggy and probably hasnt been noticed as everyone who tested stuff used -psnr)
author michael
date Tue, 21 Nov 2006 19:37:44 +0000
parents e766498e81e9
children 07625477adfa
line wrap: on
line diff
--- 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];