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 12b8b839e520936231e938c3fb0f53443c352edf..04bdd750b084362656167ce69c78a3bdc29aa39c 100644 (file)
--- 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 (file)
index 0000000..f4dda74
--- /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 (file)
index 0000000..e3dbcb7
--- /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 fb9ed5c52bc5ba0916ca9161780b5681d444f5bb..9d90edc6a371958392858478d5b5f669cd6ca2fe 100644 (file)
--- 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 (file)
index c1ccb03..0000000
--- 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 748aecd8388456afb4cf70214ffce73c1c30e008..c1ccb0301a219568269c9f18e5b164227d888139 100644 (file)
--- 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 (file)
index 0000000..f4dda74
--- /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 (file)
index 5e5a808..0000000
--- 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 (file)
index 0000000..cf64e07
--- /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