From 4149a5994f8d2b5ac37e456291b50faf890121b7 Mon Sep 17 00:00:00 2001
From: Good Guy <good1.2guy@gmail.com>
Date: Sun, 30 Apr 2017 15:50:40 -0600
Subject: [PATCH] fixes for tiff/jbig, faststart for mov mp4

---
 cinelerra-5.1/configure.ac                    | 12 +++++++++++-
 cinelerra-5.1/ffmpeg/audio/faststart_h264.mp4 |  2 ++
 cinelerra-5.1/ffmpeg/format/fqt               |  2 ++
 cinelerra-5.1/ffmpeg/video/faststart_h264.mp4 |  4 ++++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 cinelerra-5.1/ffmpeg/audio/faststart_h264.mp4
 create mode 100644 cinelerra-5.1/ffmpeg/format/fqt
 create mode 100644 cinelerra-5.1/ffmpeg/video/faststart_h264.mp4

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index e5923f7a..952f0d00 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -445,6 +445,7 @@ CHECK_LIB([giflib], [gif], [DGifOpen])
 CHECK_HEADERS([giflib], [gif lib headers], [gif_lib.h])
 CHECK_LIB([fdk], [fdk-aac], [faacDecInit])
 CHECK_HEADERS([fdk], [fdk headers], [fdk-aac/genericStds.h])
+CHECK_LIB([jbig], [jbig], [jbg_dec_init])
 
 #if test "x$HAVE_mjpegtools" = "xyes"; then
 #CFG_CFLAGS+=" -I/usr/include/mjpegtools"
@@ -678,7 +679,9 @@ echo ""
 
 # build extras
 if test "x$HAVE_tiff" = "xyes"; then
-  EXTRA_LIBS+=' -ljbig'
+  if test "x$HAVE_jbig" = "xyes"; then
+    EXTRA_LIBS+=' -ljbig'
+  fi
 fi
 if test "x$HAVE_NUMA" = "xyes"; then
   EXTRA_LIBS+=' -lnuma'
@@ -797,3 +800,10 @@ echo ""
 echo "export thirdparty_libraries libraries"
 echo "export CFLAGS_ CXXFLAGS_ LDFLAGS_"
 echo "unexport CFLAGS CXXFLAGS LDFLAGS"
+
+if test "x$HAVE_tiff" = "xyes"; then
+  if test "x$HAVE_jbig" != "xyes"; then
+    echo "tiff.cfg_params+= --disable-jbig"
+  fi
+fi
+
diff --git a/cinelerra-5.1/ffmpeg/audio/faststart_h264.mp4 b/cinelerra-5.1/ffmpeg/audio/faststart_h264.mp4
new file mode 100644
index 00000000..5b897a5f
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/faststart_h264.mp4
@@ -0,0 +1,2 @@
+fqt libfdk_aac
+strict -2
diff --git a/cinelerra-5.1/ffmpeg/format/fqt b/cinelerra-5.1/ffmpeg/format/fqt
new file mode 100644
index 00000000..9e3c7290
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/format/fqt
@@ -0,0 +1,2 @@
+mov
+movflags=+faststart
diff --git a/cinelerra-5.1/ffmpeg/video/faststart_h264.mp4 b/cinelerra-5.1/ffmpeg/video/faststart_h264.mp4
new file mode 100644
index 00000000..53f9b438
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/faststart_h264.mp4
@@ -0,0 +1,4 @@
+fqt libx264
+# use framerate for 1 keyframe/sec, needed for seeks
+keyint_min=25
+x264opts keyint=25
-- 
2.26.2