spaced30/freerdp
SHA256
1
0
Fork 0
forked from pool/freerdp
Code Pull Requests Activity

Accepting request 1083951 from X11:RemoteDesktop

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1083951
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freerdp?expand=0&rev=65
This commit is contained in:
Dominique Leuenberger 2023-05-08 15:23:52 +00:00 committed by Git OBS Bridge
commit d00268ffa1
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Update_h264_to_use_new_FFMPEG_API.patch Normal file
View File

@ -0,0 +1,42 @@
From c5d91f8ef584174310970d0f7e31d6ffad7c5246 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Tue, 14 Feb 2023 07:48:54 +0100
Subject: [PATCH] Fixed #8686: Update h264 to use new FFMPEG API
---
channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 2 ++
libfreerdp/codec/h264_ffmpeg.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
index c14877b43ac..21533746438 100644
--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
@@ -235,8 +235,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP
}
}
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;
+#endif
return TRUE;
}
diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c
index 4e3ba8f9282..9c445b8253a 100644
--- a/libfreerdp/codec/h264_ffmpeg.c
+++ b/libfreerdp/codec/h264_ffmpeg.c
@@ -529,10 +529,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264)
goto EXCEPTION;
}
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED)
{
sys->codecDecoderContext->flags |= AV_CODEC_FLAG_TRUNCATED;
}
+#endif
#ifdef WITH_VAAPI

6
freerdp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 24 17:53:55 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Add Update_h264_to_use_new_FFMPEG_API.patch: Update h264 to use
new FFMPEG API.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 16 15:05:54 UTC 2023 - Hans-Peter Jansen <hpj@urpla.net> Thu Feb 16 15:05:54 UTC 2023 - Hans-Peter Jansen <hpj@urpla.net>

2
freerdp.spec
View File

@ -49,6 +49,8 @@ Source0: https://github.com/FreeRDP/FreeRDP/archive/%{version}.tar.gz#/Fr
Source1: freerdp-rpmlintrc Source1: freerdp-rpmlintrc
# PATCH-FIX-UPSTREAM https://github.com/FreeRDP/FreeRDP/pull/7476 # PATCH-FIX-UPSTREAM https://github.com/FreeRDP/FreeRDP/pull/7476
Patch0: 0001-Make-H.264-codec-optional-during-runtime.patch Patch0: 0001-Make-H.264-codec-optional-during-runtime.patch
# PATCH-FIX-UPSTREAM https://github.com/FreeRDP/FreeRDP/commit/c5d91f8ef584174310970d0f7e31d6ffad7c5246.patch
Patch1: Update_h264_to_use_new_FFMPEG_API.patch
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: cups-devel BuildRequires: cups-devel