summaryrefslogtreecommitdiff
path: root/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2019-12-08 11:28:16 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2019-12-08 11:28:16 +0000
commite7bf608b71fb177f105df38dae8eb9e72f783331 (patch)
tree91fe71167568788cf4c77e82b5be3c3f990c27c2 /multimedia/libopenshot/files/patch-src_FFmpegReader.cpp
parentaudio/libopenshot-audio: Update to 0.1.8.100 (diff)
multimedia/libopenshot: Update to 0.2.3.490
PR: 241912 Submitted by: Tatsuki Makino <tatsuki_makino@hotmail.com> (maintainer)
Diffstat (limited to '')
-rw-r--r--multimedia/libopenshot/files/patch-src_FFmpegReader.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp b/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp
index 4e07c551c4ce..650f36969df9 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 2019-05-08 19:16:50 UTC
+--- src/FFmpegReader.cpp.orig 2019-11-04 12:14:04 UTC
+++ src/FFmpegReader.cpp
-@@ -159,7 +159,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon
+@@ -162,7 +162,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;
-@@ -312,7 +312,7 @@ void FFmpegReader::Open() {
+@@ -315,7 +315,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;
-@@ -375,11 +375,13 @@ void FFmpegReader::Open() {
+@@ -378,11 +378,13 @@ void FFmpegReader::Open() {
}
// Check if it is there and writable
@@ -32,4 +32,4 @@
+#else
if( adapter_ptr != NULL ) {
#endif
- ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device", "", -1, "", -1, "", -1, "", -1, "", -1, "", -1);
+ ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device");