Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / libx265.c

diff --git a/ffmpeg/libavcodec/libx265.c b/ffmpeg/libavcodec/libx265.c
index 55019d4768a22573351e36ce2ecc3e3af278ad44..923c7506793dd96b328bdaa2644b8e8b4c668e88 100644 (file)
--- a/ffmpeg/libavcodec/libx265.c
+++ b/ffmpeg/libavcodec/libx265.c
@@ -111,6 +111,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
     ctx->params->fpsDenom        = avctx->time_base.num * avctx->ticks_per_frame;
     ctx->params->sourceWidth     = avctx->width;
     ctx->params->sourceHeight    = avctx->height;
+    ctx->params->bEnablePsnr     = !!(avctx->flags & CODEC_FLAG_PSNR);
 
     if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) {
         av_reduce(&sar_num, &sar_den,