diff options
Diffstat (limited to 'multimedia/libopenshot/files')
| -rw-r--r-- | multimedia/libopenshot/files/patch-src_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp | 23 |
2 files changed, 22 insertions, 5 deletions
diff --git a/multimedia/libopenshot/files/patch-src_CMakeLists.txt b/multimedia/libopenshot/files/patch-src_CMakeLists.txt index 4eefbb70d58d..949d190530ac 100644 --- a/multimedia/libopenshot/files/patch-src_CMakeLists.txt +++ b/multimedia/libopenshot/files/patch-src_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/CMakeLists.txt.orig 2020-03-03 09:00:23 UTC +--- src/CMakeLists.txt.orig 2020-06-18 10:04:32 UTC +++ src/CMakeLists.txt -@@ -363,7 +363,13 @@ if (TARGET RESVG::resvg) +@@ -361,7 +361,13 @@ if (TARGET RESVG::resvg) set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") endif() diff --git a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp index 1bdbb9b29d18..06ccdb7684c7 100644 --- a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp +++ b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp @@ -1,4 +1,4 @@ ---- src/FFmpegWriter.cpp.orig 2020-03-03 09:00:23 UTC +--- src/FFmpegWriter.cpp.orig 2020-06-18 10:04:32 UTC +++ src/FFmpegWriter.cpp @@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std AVCodec *new_codec; @@ -21,7 +21,24 @@ #else // not ffmpeg 3 new_codec = avcodec_find_encoder_by_name(codec.c_str()); #endif // HAVE_HW_ACCEL -@@ -1367,7 +1367,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -554,6 +554,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s + else { + av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0); + } ++ break; + case AV_CODEC_ID_HEVC : + c->bit_rate = 0; + if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) { +@@ -562,6 +563,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s + av_opt_set_int(c->priv_data, "forced-idr",1,0); + } + break; ++ default: ++ break; + } + #endif + } else { +@@ -1447,7 +1450,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET; fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num); if (adapter_num < 3 && adapter_num >=0) { @@ -30,7 +47,7 @@ snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); // Maybe 127 is better because the first card would be 1?! adapter_ptr = adapter; -@@ -1375,17 +1375,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1455,17 +1458,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_ptr = NULL; #elif defined(__APPLE__) adapter_ptr = NULL; |