diff options
| author | Heinz Wiesinger <pprkut@slackbuilds.org> | 2013-11-03 12:01:45 +0100 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2013-11-04 00:46:03 -0600 |
| commit | b922de3c1feb6bdd69db8d52151d9df51964f885 (patch) | |
| tree | febff71258c19d7e4ce0fb70594bb9de08bb5e6b /multimedia/transcode/transcode-1.1.7-preset-free.patch | |
| parent | 53d4d93210e67f9f67ca40bdcea5121bcedb899d (diff) | |
| download | slackbuilds-b922de3c1feb6bdd69db8d52151d9df51964f885.tar.gz | |
multimedia/transcode: Fix building with new ffmpeg.
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'multimedia/transcode/transcode-1.1.7-preset-free.patch')
| -rw-r--r-- | multimedia/transcode/transcode-1.1.7-preset-free.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/multimedia/transcode/transcode-1.1.7-preset-free.patch b/multimedia/transcode/transcode-1.1.7-preset-free.patch new file mode 100644 index 0000000000..00494b94ba --- /dev/null +++ b/multimedia/transcode/transcode-1.1.7-preset-free.patch @@ -0,0 +1,34 @@ +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 @@ + } + + if(!f){ +- fprintf(stderr, "File for preset '%s' not found\n", arg); ++ tc_log_error(MOD_NAME, "File for preset '%s' not found", arg); + av_exit(1); + } + +@@ -1207,7 +1207,7 @@ + /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ + if (lavc_param_video_preset) { + 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 @@ + if (opt_preset("vpre", preset_name) != 0) { + tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name); + } ++ av_free(video_codec_name); ++ video_codec_name = NULL; + if (verbose) { + int i; + tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count); |