diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:41:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:41:41 +0200 |
| commit | cac07d0e103656a2436ea04b700128ce436a4d06 (patch) | |
| tree | 26ad63f72adfeb90f1f5857cb5c458cdd2d77ff1 /libavcodec/mpegvideo_enc.c | |
| parent | b7dd250b7545ece973bd4c92fd7f93ce042fa911 (diff) | |
| parent | 5fccedaa67390ccddd6347c8e1c71b7664558bcd (diff) | |
| download | ffmpeg-cac07d0e103656a2436ea04b700128ce436a4d06.tar.gz | |
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index cd5c19e1e3..38caf2da6e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1217,8 +1217,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; + c->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_PSNR; c->flags |= s->avctx->flags & CODEC_FLAG_QPEL; c->mb_decision = s->avctx->mb_decision; c->me_cmp = s->avctx->me_cmp; |