From: Good Guy Date: Thu, 20 Feb 2025 21:52:37 +0000 (-0700) Subject: Credit sge - trivial blend plugin fix; update flac from 1.4.3 to 1.5.0; update year... X-Git-Tag: 2025-02~5 X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=d605048960a4fdac241dd94288b477ea4350c3eb;p=goodguy%2Fcinelerra.git Credit sge - trivial blend plugin fix; update flac from 1.4.3 to 1.5.0; update year; comments for hardware requirements in render formats --- diff --git a/cinelerra-5.1/cinelerra/versioninfo.h b/cinelerra-5.1/cinelerra/versioninfo.h index 852542f5..3b733b6f 100644 --- a/cinelerra-5.1/cinelerra/versioninfo.h +++ b/cinelerra-5.1/cinelerra/versioninfo.h @@ -9,7 +9,7 @@ #define COPYRIGHTTEXT1 "(c) 2006-2019 Heroine Virtual Ltd. by Adam Williams\n" #define COPYRIGHTTEXT2 "2007-2020 mods for Cinelerra-GG by W.P.Morrow aka goodguy\n" #define COPYRIGHTTEXT3 "2003-2017 mods for Cinelerra-CV by CinelerraCV team\n" -#define COPYRIGHTTEXT4 "2015-2024 mods for Cinelerra-GG by Cinelerra-GG team\n" +#define COPYRIGHTTEXT4 "2015-2025 mods for Cinelerra-GG by Cinelerra-GG team\n" #undef COMPILEDATE diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index d7236c68..6fc69f5f 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -257,7 +257,7 @@ PKG_3RD([fftw],[auto], [ api ]) PKG_3RD([flac],[auto], - [flac-1.4.3], + [flac-1.5.0], [ src/libFLAC/.libs/libFLAC.a \ src/libFLAC++/.libs/libFLAC++.a \ src/share/replaygain_analysis/.libs/libreplaygain_analysis.a \ diff --git a/cinelerra-5.1/ffmpeg/video/av1_qsv_10b420.mp4 b/cinelerra-5.1/ffmpeg/video/av1_qsv_10b420.mp4 index 3124c595..6b330e98 100644 --- a/cinelerra-5.1/ffmpeg/video/av1_qsv_10b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/av1_qsv_10b420.mp4 @@ -1,4 +1,6 @@ mp4 av1_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=p010le profile=main # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/av1_qsv_10b420.webm b/cinelerra-5.1/ffmpeg/video/av1_qsv_10b420.webm index 4269b211..2d3df3c3 100644 --- a/cinelerra-5.1/ffmpeg/video/av1_qsv_10b420.webm +++ b/cinelerra-5.1/ffmpeg/video/av1_qsv_10b420.webm @@ -1,4 +1,6 @@ webm av1_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=p010le profile=main # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/av1_qsv_8b420.mp4 b/cinelerra-5.1/ffmpeg/video/av1_qsv_8b420.mp4 index 3034c4c0..8af145d6 100644 --- a/cinelerra-5.1/ffmpeg/video/av1_qsv_8b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/av1_qsv_8b420.mp4 @@ -1,4 +1,6 @@ mp4 av1_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=nv12 profile=main # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/av1_qsv_8b420.webm b/cinelerra-5.1/ffmpeg/video/av1_qsv_8b420.webm index e6dd5ba9..36db0bc3 100644 --- a/cinelerra-5.1/ffmpeg/video/av1_qsv_8b420.webm +++ b/cinelerra-5.1/ffmpeg/video/av1_qsv_8b420.webm @@ -1,4 +1,6 @@ webm av1_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=nv12 profile=main # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/av1_vaapi_10b420.mp4 b/cinelerra-5.1/ffmpeg/video/av1_vaapi_10b420.mp4 index 20ed818a..ad72e138 100644 --- a/cinelerra-5.1/ffmpeg/video/av1_vaapi_10b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/av1_vaapi_10b420.mp4 @@ -1,4 +1,6 @@ mp4 av1_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=p010le profile=main diff --git a/cinelerra-5.1/ffmpeg/video/av1_vaapi_10b420.webm b/cinelerra-5.1/ffmpeg/video/av1_vaapi_10b420.webm index 07b74bec..a097ee40 100644 --- a/cinelerra-5.1/ffmpeg/video/av1_vaapi_10b420.webm +++ b/cinelerra-5.1/ffmpeg/video/av1_vaapi_10b420.webm @@ -1,4 +1,6 @@ webm av1_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=p010le profile=main diff --git a/cinelerra-5.1/ffmpeg/video/av1_vaapi_8b420.mp4 b/cinelerra-5.1/ffmpeg/video/av1_vaapi_8b420.mp4 index ce41a323..a744f35c 100644 --- a/cinelerra-5.1/ffmpeg/video/av1_vaapi_8b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/av1_vaapi_8b420.mp4 @@ -1,4 +1,6 @@ mp4 av1_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=nv12 profile=main diff --git a/cinelerra-5.1/ffmpeg/video/av1_vaapi_8b420.webm b/cinelerra-5.1/ffmpeg/video/av1_vaapi_8b420.webm index 117ebb18..41915ea8 100644 --- a/cinelerra-5.1/ffmpeg/video/av1_vaapi_8b420.webm +++ b/cinelerra-5.1/ffmpeg/video/av1_vaapi_8b420.webm @@ -1,4 +1,6 @@ webm av1_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=nv12 profile=main diff --git a/cinelerra-5.1/ffmpeg/video/h264_qsv_8b420.mp4 b/cinelerra-5.1/ffmpeg/video/h264_qsv_8b420.mp4 index 145ad676..3b3f0f39 100644 --- a/cinelerra-5.1/ffmpeg/video/h264_qsv_8b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/h264_qsv_8b420.mp4 @@ -1,4 +1,6 @@ mp4 h264_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=nv12 profile=high # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/h264_vaapi.mkv b/cinelerra-5.1/ffmpeg/video/h264_vaapi.mkv index 8a22ef3f..bb8134f8 100644 --- a/cinelerra-5.1/ffmpeg/video/h264_vaapi.mkv +++ b/cinelerra-5.1/ffmpeg/video/h264_vaapi.mkv @@ -1,4 +1,5 @@ matroska h264_vaapi -# Only works when there is vaapi capable hardware and software +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi profile=high diff --git a/cinelerra-5.1/ffmpeg/video/h264_vaapi.mp4 b/cinelerra-5.1/ffmpeg/video/h264_vaapi.mp4 index 085d70d4..ab61bbd7 100644 --- a/cinelerra-5.1/ffmpeg/video/h264_vaapi.mp4 +++ b/cinelerra-5.1/ffmpeg/video/h264_vaapi.mp4 @@ -1,3 +1,5 @@ mp4 h264_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi profile=high diff --git a/cinelerra-5.1/ffmpeg/video/h264_vaapi.qt b/cinelerra-5.1/ffmpeg/video/h264_vaapi.qt index 48ff1e87..38ba8f2d 100644 --- a/cinelerra-5.1/ffmpeg/video/h264_vaapi.qt +++ b/cinelerra-5.1/ffmpeg/video/h264_vaapi.qt @@ -1,3 +1,5 @@ mov h264_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi profile=high diff --git a/cinelerra-5.1/ffmpeg/video/h264_vaapi_8b420.mp4 b/cinelerra-5.1/ffmpeg/video/h264_vaapi_8b420.mp4 index 1a457604..104e681a 100644 --- a/cinelerra-5.1/ffmpeg/video/h264_vaapi_8b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/h264_vaapi_8b420.mp4 @@ -1,4 +1,6 @@ mp4 h264_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=nv12 profile=high diff --git a/cinelerra-5.1/ffmpeg/video/hevc_qsv_10b420.mp4 b/cinelerra-5.1/ffmpeg/video/hevc_qsv_10b420.mp4 index ebc8ddb2..8214ff26 100644 --- a/cinelerra-5.1/ffmpeg/video/hevc_qsv_10b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/hevc_qsv_10b420.mp4 @@ -1,4 +1,6 @@ mp4 hevc_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=p010le profile=main10 # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/hevc_qsv_10b422.mp4 b/cinelerra-5.1/ffmpeg/video/hevc_qsv_10b422.mp4 index 04e47034..c265f5b1 100644 --- a/cinelerra-5.1/ffmpeg/video/hevc_qsv_10b422.mp4 +++ b/cinelerra-5.1/ffmpeg/video/hevc_qsv_10b422.mp4 @@ -1,4 +1,6 @@ mp4 hevc_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=y210le profile=0 # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/hevc_qsv_8b420.mp4 b/cinelerra-5.1/ffmpeg/video/hevc_qsv_8b420.mp4 index 66eadbbb..a3a804b8 100644 --- a/cinelerra-5.1/ffmpeg/video/hevc_qsv_8b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/hevc_qsv_8b420.mp4 @@ -1,4 +1,6 @@ mp4 hevc_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=nv12 profile=main # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/hevc_vaapi.mp4 b/cinelerra-5.1/ffmpeg/video/hevc_vaapi.mp4 index 4e57f2b4..a6cb34c3 100644 --- a/cinelerra-5.1/ffmpeg/video/hevc_vaapi.mp4 +++ b/cinelerra-5.1/ffmpeg/video/hevc_vaapi.mp4 @@ -1,2 +1,4 @@ mp4 hevc_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi diff --git a/cinelerra-5.1/ffmpeg/video/hevc_vaapi_10b420.mp4 b/cinelerra-5.1/ffmpeg/video/hevc_vaapi_10b420.mp4 index 3639b3b0..f49f778b 100644 --- a/cinelerra-5.1/ffmpeg/video/hevc_vaapi_10b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/hevc_vaapi_10b420.mp4 @@ -1,4 +1,6 @@ mp4 hevc_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=p010le profile=main10 diff --git a/cinelerra-5.1/ffmpeg/video/hevc_vaapi_10b422.mp4 b/cinelerra-5.1/ffmpeg/video/hevc_vaapi_10b422.mp4 index 3a64bf7c..13f18fd3 100644 --- a/cinelerra-5.1/ffmpeg/video/hevc_vaapi_10b422.mp4 +++ b/cinelerra-5.1/ffmpeg/video/hevc_vaapi_10b422.mp4 @@ -1,4 +1,6 @@ mp4 hevc_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=y210le profile=rext diff --git a/cinelerra-5.1/ffmpeg/video/hevc_vaapi_8b420.mp4 b/cinelerra-5.1/ffmpeg/video/hevc_vaapi_8b420.mp4 index 08c598ef..541cdb21 100644 --- a/cinelerra-5.1/ffmpeg/video/hevc_vaapi_8b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/hevc_vaapi_8b420.mp4 @@ -1,4 +1,6 @@ mp4 hevc_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=nv12 profile=main diff --git a/cinelerra-5.1/ffmpeg/video/vp9_qsv_10b420.mp4 b/cinelerra-5.1/ffmpeg/video/vp9_qsv_10b420.mp4 index bc269964..91a53599 100644 --- a/cinelerra-5.1/ffmpeg/video/vp9_qsv_10b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/vp9_qsv_10b420.mp4 @@ -1,4 +1,6 @@ mp4 vp9_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=p010le profile=0 # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/vp9_qsv_10b420.webm b/cinelerra-5.1/ffmpeg/video/vp9_qsv_10b420.webm index 9719b009..b0ee96bd 100644 --- a/cinelerra-5.1/ffmpeg/video/vp9_qsv_10b420.webm +++ b/cinelerra-5.1/ffmpeg/video/vp9_qsv_10b420.webm @@ -1,4 +1,6 @@ webm vp9_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=p010le profile=0 # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/vp9_qsv_8b420.mp4 b/cinelerra-5.1/ffmpeg/video/vp9_qsv_8b420.mp4 index f3ed61cf..7228c40a 100644 --- a/cinelerra-5.1/ffmpeg/video/vp9_qsv_8b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/vp9_qsv_8b420.mp4 @@ -1,4 +1,6 @@ mp4 vp9_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=nv12 profile=0 # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/vp9_qsv_8b420.webm b/cinelerra-5.1/ffmpeg/video/vp9_qsv_8b420.webm index 6652fbbe..ca0caafb 100644 --- a/cinelerra-5.1/ffmpeg/video/vp9_qsv_8b420.webm +++ b/cinelerra-5.1/ffmpeg/video/vp9_qsv_8b420.webm @@ -1,4 +1,6 @@ webm vp9_qsv +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_pix_fmt=nv12 profile=0 # global_quality=25 diff --git a/cinelerra-5.1/ffmpeg/video/vp9_vaapi_10b420.mp4 b/cinelerra-5.1/ffmpeg/video/vp9_vaapi_10b420.mp4 index 686083c4..7a7dedb3 100644 --- a/cinelerra-5.1/ffmpeg/video/vp9_vaapi_10b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/vp9_vaapi_10b420.mp4 @@ -1,4 +1,6 @@ mp4 vp9_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=p010le profile=0 diff --git a/cinelerra-5.1/ffmpeg/video/vp9_vaapi_10b420.webm b/cinelerra-5.1/ffmpeg/video/vp9_vaapi_10b420.webm index 94940c4c..a9df1420 100644 --- a/cinelerra-5.1/ffmpeg/video/vp9_vaapi_10b420.webm +++ b/cinelerra-5.1/ffmpeg/video/vp9_vaapi_10b420.webm @@ -1,4 +1,6 @@ webm vp9_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=p010le profile=2 diff --git a/cinelerra-5.1/ffmpeg/video/vp9_vaapi_8b420.mp4 b/cinelerra-5.1/ffmpeg/video/vp9_vaapi_8b420.mp4 index fb6a0f19..862752f7 100644 --- a/cinelerra-5.1/ffmpeg/video/vp9_vaapi_8b420.mp4 +++ b/cinelerra-5.1/ffmpeg/video/vp9_vaapi_8b420.mp4 @@ -1,4 +1,6 @@ mp4 vp9_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=nv12 profile=0 diff --git a/cinelerra-5.1/ffmpeg/video/vp9_vaapi_8b420.webm b/cinelerra-5.1/ffmpeg/video/vp9_vaapi_8b420.webm index f727d976..efb06ac9 100644 --- a/cinelerra-5.1/ffmpeg/video/vp9_vaapi_8b420.webm +++ b/cinelerra-5.1/ffmpeg/video/vp9_vaapi_8b420.webm @@ -1,4 +1,6 @@ webm vp9_vaapi +# Requires specific GPU hardware encoding capability +# as well as required software implementation. cin_hw_dev=vaapi cin_pix_fmt=nv12 profile=0 diff --git a/cinelerra-5.1/plugins/blendalgebra/blendalgebra.C b/cinelerra-5.1/plugins/blendalgebra/blendalgebra.C index 531a755e..9f5a8035 100644 --- a/cinelerra-5.1/plugins/blendalgebra/blendalgebra.C +++ b/cinelerra-5.1/plugins/blendalgebra/blendalgebra.C @@ -378,7 +378,6 @@ void BlendAlgebraFileButton::run() printf ("BlendAlgebraFileButton::run creating file_box (%s)\n", fname); #endif file_box = new BlendAlgebraFileBox (plugin, gui, fname); - file_box->update_history(); // otherwise actual dir can be forgotten file_box->create_objects(); file_box->lock_window ("BlendAlgebraFileButton::run"); file_box->add_objects(); // add our special buttons diff --git a/cinelerra-5.1/plugins/blendprogram/blendprogram.C b/cinelerra-5.1/plugins/blendprogram/blendprogram.C index 63cd99b9..07e4f255 100644 --- a/cinelerra-5.1/plugins/blendprogram/blendprogram.C +++ b/cinelerra-5.1/plugins/blendprogram/blendprogram.C @@ -363,7 +363,6 @@ void BlendProgramFileButton::run() printf ("BlendProgramFileButton::run creating file_box (%s)\n", fname); #endif file_box = new BlendProgramFileBox (plugin, gui, fname); - file_box->update_history(); // otherwise actual dir can be forgotten file_box->create_objects(); file_box->lock_window ("BlendProgramFileButton::run"); file_box->add_objects(); // add our special buttons diff --git a/cinelerra-5.1/thirdparty/src/flac-1.5.0.tar.xz b/cinelerra-5.1/thirdparty/src/flac-1.5.0.tar.xz new file mode 100644 index 00000000..78961a68 Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/flac-1.5.0.tar.xz differ