summaryrefslogtreecommitdiff
path: root/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp')
-rw-r--r--multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
index 06948a8a0020..827ea05a2821 100644
--- a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
+++ b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
@@ -1,7 +1,7 @@
---- src/FFmpegWriter.cpp.orig 2021-08-19 20:40:39 UTC
+--- src/FFmpegWriter.cpp.orig 2022-12-01 22:04:03 UTC
+++ src/FFmpegWriter.cpp
-@@ -169,7 +169,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
- AVCodec *new_codec;
+@@ -166,7 +166,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
+ const AVCodec *new_codec;
// Check if the codec selected is a hardware accelerated codec
#if USE_HW_ACCEL
-#if defined(__linux__)
@@ -9,7 +9,7 @@
if (strstr(codec.c_str(), "_vaapi") != NULL) {
new_codec = avcodec_find_encoder_by_name(codec.c_str());
hw_en_on = 1;
-@@ -219,7 +219,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
+@@ -216,7 +216,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
}
#else // unknown OS
new_codec = avcodec_find_encoder_by_name(codec.c_str());
@@ -18,7 +18,7 @@
#else // USE_HW_ACCEL
new_codec = avcodec_find_encoder_by_name(codec.c_str());
#endif // USE_HW_ACCEL
-@@ -568,6 +568,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
+@@ -563,6 +563,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
else {
av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);
}
@@ -26,7 +26,7 @@
case AV_CODEC_ID_HEVC :
c->bit_rate = 0;
if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {
-@@ -576,6 +577,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
+@@ -571,6 +572,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
av_opt_set_int(c->priv_data, "forced-idr",1,0);
}
break;
@@ -35,7 +35,7 @@
}
#endif // FFmpeg 4.0+
} else {
-@@ -1400,21 +1403,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
+@@ -1459,21 +1462,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
std::clog << "Encoding Device Nr: " << adapter_num << "\n";
if (adapter_num < 3 && adapter_num >=0) {
@@ -62,4 +62,4 @@
+#else
if( adapter_ptr != NULL ) {
#endif
- ZmqLogger::Instance()->AppendDebugMethod("Encode Device present using device", "adapter", adapter_num);
+ ZmqLogger::Instance()->AppendDebugMethod(