diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:12:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:19:24 +0100 |
| commit | 2830f287e2f271bcf773f645e5d9cb9aa5204f7f (patch) | |
| tree | ceda9d20e4c2e19e32e1c092e36dc8558fb0f0e2 /libavcodec/mpegvideo_enc.c | |
| parent | bba73f5574afd3095e017f70bca1547dd43f702f (diff) | |
| parent | ebfe622bb1ca57cecb932e42926745cba7161913 (diff) | |
Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'
* commit 'ebfe622bb1ca57cecb932e42926745cba7161913':
mpegvideo: drop support for real (non-emulated) edges
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_motion.c
libavcodec/wmv2.c
If this is slower on a major platform then it should be investigated
and potentially reverted.
See: 8fc52a5ef94712d900fc8fe7503cf9c9ba635143
See: 3969b4b861ce8152e3195e8f8c3437abd273b90a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index c84837b71a..09f96e4253 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1209,7 +1209,7 @@ static int estimate_best_b_count(MpegEncContext *s) c->width = s->width >> scale; c->height = s->height >> scale; c->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_PSNR | - CODEC_FLAG_INPUT_PRESERVED /*| CODEC_FLAG_EMU_EDGE*/; + CODEC_FLAG_INPUT_PRESERVED; c->flags |= s->avctx->flags & CODEC_FLAG_QPEL; c->mb_decision = s->avctx->mb_decision; c->me_cmp = s->avctx->me_cmp; |