diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 13:50:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 15:04:40 +0100 |
| commit | 34fe125f4bc8b6fba16140517c01424cba302499 (patch) | |
| tree | b6007a2fda09a42157f5fd415c4f276d2bf42c02 /libavcodec/mpegvideo.c | |
| parent | 241eccd62898207906df6998807551a565a71138 (diff) | |
| download | ffmpeg-34fe125f4bc8b6fba16140517c01424cba302499.tar.gz | |
avcodec/mpegvideo_enc: fix frame skipping with intra only codecs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 4c25845b8c..e96791af6b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2655,7 +2655,9 @@ FF_ENABLE_DEPRECATION_WARNINGS else if (!is_mpeg12 && (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==AV_PICTURE_TYPE_B) && s->avctx->mb_decision != FF_MB_DECISION_RD)) { //FIXME precalc + if ( (s->flags&CODEC_FLAG_PSNR) + || s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor + || !(s->encoding && (s->intra_only || s->pict_type==AV_PICTURE_TYPE_B) && 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]; |