From 8892d0492d925f2adb379d2ee3632534b75d020e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 9 Nov 2011 18:58:07 +0100 Subject: [PATCH] Revert commit 0bc391281ad80d4eb365f3d8978637b07003e8dc ffmpeg: remove -psnr option. Signed-off-by: Michael Niedermayer --- ffmpeg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index f7232c9f8d..d205530b35 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -134,6 +134,7 @@ static int file_overwrite = 0; static int do_benchmark = 0; static int do_hex_dump = 0; static int do_pkt_dump = 0; +static int do_psnr = 0; static int do_pass = 0; static const char *pass_logfilename_prefix; static int video_sync_method= -1; @@ -3660,6 +3661,9 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size*3/4; video_enc->intra_dc_precision= intra_dc_precision - 8; + if (do_psnr) + video_enc->flags|= CODEC_FLAG_PSNR; + /* two pass mode */ if (do_pass) { if (do_pass & 1) { @@ -4624,6 +4628,7 @@ static const OptionDef options[] = { { "passlogfile", HAS_ARG | OPT_VIDEO, {(void*)&opt_passlogfile}, "select two pass log file name prefix", "prefix" }, { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace}, "deinterlace pictures" }, + { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, #if CONFIG_AVFILTER