From e7bf608b71fb177f105df38dae8eb9e72f783331 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sun, 8 Dec 2019 11:28:16 +0000 Subject: multimedia/libopenshot: Update to 0.2.3.490 PR: 241912 Submitted by: Tatsuki Makino (maintainer) --- multimedia/libopenshot/files/patch-src_FFmpegReader.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'multimedia/libopenshot/files/patch-src_FFmpegReader.cpp') 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"); -- cgit v1.2.3