From: Good Guy <good1.2guy@gmail.com>
Date: Mon, 29 Jun 2015 15:36:15 +0000 (-0600)
Subject: add u2b format type, tweak j2k, mjpg. rm raw_gray
X-Git-Url: http://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=d65cc9c54f1418b5c865468e51b495ea33fcba05;p=goodguy%2Fhistory.git

add u2b format type, tweak j2k, mjpg. rm raw_gray
---

diff --git a/cinelerra-5.0/cinelerra/fileffmpeg.C b/cinelerra-5.0/cinelerra/fileffmpeg.C
index 12b8b839..04bdd750 100644
--- a/cinelerra-5.0/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.0/cinelerra/fileffmpeg.C
@@ -465,6 +465,7 @@ FFMPEGConfigVideo::FFMPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset)
 	preset_popup = 0;
 
 	bitrate = 0;
+	quality = 0;
 	video_options = 0;
 }
 
diff --git a/cinelerra-5.0/ffmpeg/audio/mkv.dfl b/cinelerra-5.0/ffmpeg/audio/mkv.dfl
new file mode 100644
index 00000000..f4dda749
--- /dev/null
+++ b/cinelerra-5.0/ffmpeg/audio/mkv.dfl
@@ -0,0 +1 @@
+u2b.mkv
diff --git a/cinelerra-5.0/ffmpeg/audio/u2b.mkv b/cinelerra-5.0/ffmpeg/audio/u2b.mkv
new file mode 100644
index 00000000..e3dbcb7d
--- /dev/null
+++ b/cinelerra-5.0/ffmpeg/audio/u2b.mkv
@@ -0,0 +1 @@
+matroska libvorbis
diff --git a/cinelerra-5.0/ffmpeg/video/j2k.qt b/cinelerra-5.0/ffmpeg/video/j2k.qt
index fb9ed5c5..9d90edc6 100644
--- a/cinelerra-5.0/ffmpeg/video/j2k.qt
+++ b/cinelerra-5.0/ffmpeg/video/j2k.qt
@@ -1 +1,2 @@
 mov jpeg2000
+strict -2
diff --git a/cinelerra-5.0/ffmpeg/video/mjpa.qt b/cinelerra-5.0/ffmpeg/video/mjpa.qt
deleted file mode 100644
index c1ccb030..00000000
--- a/cinelerra-5.0/ffmpeg/video/mjpa.qt
+++ /dev/null
@@ -1 +0,0 @@
-mov mjpeg
diff --git a/cinelerra-5.0/ffmpeg/video/mjpg.qt b/cinelerra-5.0/ffmpeg/video/mjpg.qt
index 748aecd8..c1ccb030 100644
--- a/cinelerra-5.0/ffmpeg/video/mjpg.qt
+++ b/cinelerra-5.0/ffmpeg/video/mjpg.qt
@@ -1 +1 @@
-mov mjpegb
+mov mjpeg
diff --git a/cinelerra-5.0/ffmpeg/video/mkv.dfl b/cinelerra-5.0/ffmpeg/video/mkv.dfl
new file mode 100644
index 00000000..f4dda749
--- /dev/null
+++ b/cinelerra-5.0/ffmpeg/video/mkv.dfl
@@ -0,0 +1 @@
+u2b.mkv
diff --git a/cinelerra-5.0/ffmpeg/video/raw_gray.qt b/cinelerra-5.0/ffmpeg/video/raw_gray.qt
deleted file mode 100644
index 5e5a8080..00000000
--- a/cinelerra-5.0/ffmpeg/video/raw_gray.qt
+++ /dev/null
@@ -1,2 +0,0 @@
-mov rawvideo
-pixel_format gray
diff --git a/cinelerra-5.0/ffmpeg/video/u2b.mkv b/cinelerra-5.0/ffmpeg/video/u2b.mkv
new file mode 100644
index 00000000..cf64e073
--- /dev/null
+++ b/cinelerra-5.0/ffmpeg/video/u2b.mkv
@@ -0,0 +1,7 @@
+matroska libx264
+preset slow
+crf 18
+g 25
+qmin 10
+qmax 51
+qdiff 4