summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-09-02 17:31:14 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-11 17:30:04 +0200
commit0bc391281ad80d4eb365f3d8978637b07003e8dc (patch)
treeada64b9bf7db3b75433d1337f12094e212946a89 /avconv.c
parentd242d80e36eca6d6f123832ed280d39acb59e680 (diff)
avconv: remove -psnr option.
It's redundant -- -flags +psnr does the same thing.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/avconv.c b/avconv.c
index 28e171e6d5..1cd9ce8a5e 100644
--- a/avconv.c
+++ b/avconv.c
@@ -117,7 +117,6 @@ 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 char *pass_logfilename_prefix = NULL;
static int video_sync_method= -1;
@@ -3088,9 +3087,6 @@ 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) {
@@ -3967,7 +3963,6 @@ static const OptionDef options[] = {
{ "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename_prefix}, "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