aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-08-09 01:05:28 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-08-09 01:11:37 +0200
commitf8dc2e51aa43eb5fcb97b1def6ca421420d5443e (patch)
tree57d8873904805a09d89774a4a687072da00993ff
parent9a5f61ac62ab1a191f0ea81caef1e386a4c1e242 (diff)
downloadffmpeg-f8dc2e51aa43eb5fcb97b1def6ca421420d5443e.tar.gz
ffmpeg: fix passlogfile regression
-rw-r--r--ffmpeg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 672ad2d152..2c66076c50 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4378,7 +4378,11 @@ static void log_callback_null(void* ptr, int level, const char* fmt, va_list vl)
static int opt_passlogfile(const char *opt, const char *arg)
{
pass_logfilename_prefix = arg;
+#if CONFIG_LIBX264_ENCODER
return opt_default("passlogfile", arg);
+#else
+ return 0;
+#endif
}
static const OptionDef options[] = {