summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-06-28 08:37:58 +0200
committerAnton Khirnov <anton@khirnov.net>2015-07-19 09:34:24 +0200
commit6d5d9246042acb804a652e6fedfb7afe0ca85614 (patch)
tree1b34594230e1194eded43bccd6dd682ae2d3dc76 /avconv.c
parent59245e0c5e10a849e67c632cccf4f677b2442e82 (diff)
avconv: move handling the 2pass logfile into avconv_opt
It more logically belongs there.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/avconv.c b/avconv.c
index 0394a86047..87b120fc2c 100644
--- a/avconv.c
+++ b/avconv.c
@@ -93,8 +93,6 @@ static int nb_frames_drop = 0;
static int transcoding_finished;
#endif
-#define DEFAULT_PASS_LOGFILENAME_PREFIX "av2pass"
-
InputStream **input_streams = NULL;
int nb_input_streams = 0;
InputFile **input_files = NULL;
@@ -1860,38 +1858,6 @@ static int transcode_init(void)
abort();
break;
}
- /* two pass mode */
- if ((enc_ctx->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2))) {
- char logfilename[1024];
- FILE *f;
-
- snprintf(logfilename, sizeof(logfilename), "%s-%d.log",
- ost->logfile_prefix ? ost->logfile_prefix :
- DEFAULT_PASS_LOGFILENAME_PREFIX,
- i);
- if (!strcmp(ost->enc->name, "libx264")) {
- av_dict_set(&ost->encoder_opts, "stats", logfilename, AV_DICT_DONT_OVERWRITE);
- } else {
- if (enc_ctx->flags & CODEC_FLAG_PASS1) {
- f = fopen(logfilename, "wb");
- if (!f) {
- av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
- logfilename, strerror(errno));
- exit_program(1);
- }
- ost->logfile = f;
- } else {
- char *logbuffer;
- size_t logbuffer_size;
- if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
- av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
- logfilename);
- exit_program(1);
- }
- enc_ctx->stats_in = logbuffer;
- }
- }
- }
}
}