diff options
Diffstat (limited to 'multimedia/libopenshot/files')
| -rw-r--r-- | multimedia/libopenshot/files/patch-src_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | multimedia/libopenshot/files/patch-src_FFmpegReader.cpp | 8 | ||||
| -rw-r--r-- | multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/multimedia/libopenshot/files/patch-src_CMakeLists.txt b/multimedia/libopenshot/files/patch-src_CMakeLists.txt index 949d190530ac..fdd9f060d6ab 100644 --- a/multimedia/libopenshot/files/patch-src_CMakeLists.txt +++ b/multimedia/libopenshot/files/patch-src_CMakeLists.txt @@ -1,7 +1,7 @@ ---- src/CMakeLists.txt.orig 2020-06-18 10:04:32 UTC +--- src/CMakeLists.txt.orig 2020-09-11 02:37:02 UTC +++ src/CMakeLists.txt -@@ -361,7 +361,13 @@ if (TARGET RESVG::resvg) - set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") +@@ -384,7 +384,13 @@ if (TARGET RESVG::resvg) + endif() +find_library(EXECINFO_LIBRARY NAMES execinfo) @@ -13,4 +13,4 @@ + # Link remaining dependency libraries target_link_libraries(openshot PUBLIC - ${LIBOPENSHOT_AUDIO_LIBRARIES} + ${LIBOPENSHOT_AUDIO_LIBRARIES} diff --git a/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp b/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp index 2ba92d216480..7f980ec0851a 100644 --- a/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp +++ b/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp @@ -1,6 +1,6 @@ ---- src/FFmpegReader.cpp.orig 2020-02-10 17:52:00 UTC +--- src/FFmpegReader.cpp.orig 2020-09-11 02:37:02 UTC +++ src/FFmpegReader.cpp -@@ -162,7 +162,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon +@@ -165,7 +165,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { switch (*p) { @@ -9,7 +9,7 @@ // Linux pix formats case AV_PIX_FMT_VAAPI: hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI; -@@ -318,7 +318,7 @@ void FFmpegReader::Open() { +@@ -321,7 +321,7 @@ void FFmpegReader::Open() { pCodecCtx->get_format = get_hw_dec_format; if (adapter_num < 3 && adapter_num >=0) { @@ -18,7 +18,7 @@ snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); adapter_ptr = adapter; i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER; -@@ -381,11 +381,13 @@ void FFmpegReader::Open() { +@@ -384,11 +384,13 @@ void FFmpegReader::Open() { } // Check if it is there and writable diff --git a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp index 06ccdb7684c7..562e9494befb 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-06-18 10:04:32 UTC +--- src/FFmpegWriter.cpp.orig 2020-09-11 02:37:02 UTC +++ src/FFmpegWriter.cpp @@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std AVCodec *new_codec; @@ -21,7 +21,7 @@ #else // not ffmpeg 3 new_codec = avcodec_find_encoder_by_name(codec.c_str()); #endif // HAVE_HW_ACCEL -@@ -554,6 +554,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s +@@ -556,6 +556,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s else { av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0); } @@ -29,7 +29,7 @@ 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 +@@ -564,6 +565,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s av_opt_set_int(c->priv_data, "forced-idr",1,0); } break; @@ -38,7 +38,7 @@ } #endif } else { -@@ -1447,7 +1450,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1456,7 +1459,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) { @@ -47,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; -@@ -1455,17 +1458,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1464,17 +1467,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_ptr = NULL; #elif defined(__APPLE__) adapter_ptr = NULL; |