- rediff patches

diff --git a/transcode-1.1.7-preset-force.patch b/transcode-1.1.7-preset-force.patch
index 0d1da8b4f6664178449986fa821eb501455d9cea..69bdb23299ef515a77554e1c16af1ea857e9eb09 100644 (file)
--- a/transcode-1.1.7-preset-force.patch
+++ b/transcode-1.1.7-preset-force.patch
@@ -2,8 +2,9 @@ Do not force using a preset. Do not try to open non-existant preset by default.
 
 Index: transcode-1.1.7/export/export_ffmpeg.c
 ===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
+diff -urNp -x '*.orig' transcode-1.1.7.org/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
+--- transcode-1.1.7.org/export/export_ffmpeg.c 2022-04-04 12:28:07.356413239 +0200
++++ transcode-1.1.7/export/export_ffmpeg.c     2022-04-04 12:28:07.569748264 +0200
 @@ -1206,7 +1206,7 @@ MOD_init
      lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
  
@@ -11,12 +12,11 @@ Index: transcode-1.1.7/export/export_ffmpeg.c
 -      if (lavc_param_video_preset) {
 +      if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
                avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
-               video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
+               video_codec_name = ffmpeg_codec_name(codec->name);
  
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
+diff -urNp -x '*.orig' transcode-1.1.7.org/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c
+--- transcode-1.1.7.org/export/ffmpeg_cfg.c    2022-04-04 12:28:07.359746599 +0200
++++ transcode-1.1.7/export/ffmpeg_cfg.c        2022-04-04 12:28:07.569748264 +0200
 @@ -124,7 +124,7 @@ int lavc_param_gmc = 0;
  //int lavc_param_atag = 0;
  //int lavc_param_abitrate = 224;

diff --git a/transcode-1.1.7-preset-free.patch b/transcode-1.1.7-preset-free.patch
index 00494b94ba9fbf10663aecc2b468679ad5679828..c71a884c1ddd552ed9cb98377cf2285bbf8c085d 100644 (file)
--- a/transcode-1.1.7-preset-free.patch
+++ b/transcode-1.1.7-preset-free.patch
@@ -2,10 +2,10 @@ Fix invalid free when preset file not found
 https://bugs.gentoo.org/show_bug.cgi?id=322945
 Author: Brennan Shacklett
 
-diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
---- transcode-1.1.7-orig/export/export_ffmpeg.c        2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/export_ffmpeg.c     2012-07-03 20:07:05.669083945 -0700
-@@ -321,7 +321,7 @@
+diff -urNp -x '*.orig' transcode-1.1.7.org/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
+--- transcode-1.1.7.org/export/export_ffmpeg.c 2022-04-04 12:28:07.839750405 +0200
++++ transcode-1.1.7/export/export_ffmpeg.c     2022-04-04 12:28:08.059752149 +0200
+@@ -322,7 +322,7 @@ static int opt_preset(const char *opt, c
      }
  
      if(!f){
@@ -14,16 +14,16 @@ diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/exp
          av_exit(1);
      }
  
-@@ -1207,7 +1207,7 @@
+@@ -1208,7 +1208,7 @@ MOD_init
        /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
-       if (lavc_param_video_preset) {
+       if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
                avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
 -              video_codec_name = ffmpeg_codec_name(codec->name);
 +              video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
  
                const char *preset_start = lavc_param_video_preset;
                while (preset_start) {
-@@ -1225,6 +1225,8 @@
+@@ -1226,6 +1226,8 @@ MOD_init
                        if (opt_preset("vpre", preset_name) != 0) {
                                tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name);
                        }