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:10:05 +0200
commit6605d4377725641082962381c25befd4c6fb0bde (patch)
tree4a5016c677e0cb67e3424c89215882d2b89a9157
parente1e3d79ef3b1cfa0b5052dcba9eac7a84ca55551 (diff)
downloadffmpeg-6605d4377725641082962381c25befd4c6fb0bde.tar.gz
ffmpeg: fix passlogfile regression
(cherry picked from commit 3e26abcd88a04e4a50c471988973591d848d4936)
-rw-r--r--ffmpeg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 0952cada82..133ac0f0b2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4380,7 +4380,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[] = {