diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-11-21 19:37:44 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-11-21 19:37:44 +0000 |
| commit | bb243e71009962e73f9f4b8dffd972c19481e6e5 (patch) | |
| tree | ddbb536625f82aefb52ff57dde921516cd6ca05a /libavcodec/mpegvideo.c | |
| parent | 169bc475d1eff036c9784811fce9d3949df124bc (diff) | |
| download | ffmpeg-streaming-bb243e71009962e73f9f4b8dffd972c19481e6e5.zip ffmpeg-streaming-bb243e71009962e73f9f4b8dffd972c19481e6e5.tar.gz | |
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
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 58d1c95..f0a04a4 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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]; |
