[FFmpeg-cvslog] ffmpeg: fix passlogfile regression

Carl Eugen Hoyos git at videolan.org
Tue Aug 9 01:12:24 CEST 2011


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

ffmpeg: fix passlogfile regression

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

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

diff --git a/ffmpeg.c b/ffmpeg.c
index 672ad2d..2c66076 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[] = {



More information about the ffmpeg-cvslog mailing list