[FFmpeg-cvslog] ffmpeg: fix passlogfile regression

Carl Eugen Hoyos git at videolan.org
Tue Aug 9 01:10:54 CEST 2011


ffmpeg | branch: oldabi | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Aug  9 01:05:28 2011 +0200| [6605d4377725641082962381c25befd4c6fb0bde] | committer: Carl Eugen Hoyos

ffmpeg: fix passlogfile regression
(cherry picked from commit 3e26abcd88a04e4a50c471988973591d848d4936)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6605d4377725641082962381c25befd4c6fb0bde
---

 ffmpeg.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 0952cad..133ac0f 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[] = {



More information about the ffmpeg-cvslog mailing list