mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-19 16:40:46 -09:00
5cb9002e81
Added four upstream patches backported from FreeRDP 3.x.
The remaining build error:
/home/bernd/buildroot/output/build/freerdp-2.11.7-18-g0ee17e2f8e49d56ab5b90d5160fa8f87ffc445e0/
channels/client/tables.c:129:22:
error: initialization of ‘UINT (*)(void)’ {aka ‘unsigned int (*)(void)’}
from incompatible pointer type ‘UINT (*)(void *)’ {aka ‘unsigned int (*)(void *)’}
[-Wincompatible-pointer-types]
129 | { "oss", "", oss_freerdp_rdpsnd_client_subsystem_entry },
is fixed by adding -Wno-incompatible-pointer-types to CFLAGS due to
tables.c being dynamically created during the build and backporting the
supposed upstream fix
fe6d861a5c
is too invasive.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From dcc8f415866e348ae86cfe85fde3c2d9285a7208 Mon Sep 17 00:00:00 2001
|
|
From: akallabeth <akallabeth@posteo.net>
|
|
Date: Tue, 28 Jan 2025 20:25:17 +0100
|
|
Subject: [PATCH] ignore EAGAIN for FFMPEG
|
|
|
|
Upstream: https://github.com/FreeRDP/FreeRDP/commit/726add2a982bfdf4cffef3cc95395c9a4b49385b
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
[partially backported to stable-2.0 branch]
|
|
---
|
|
libfreerdp/codec/h264_ffmpeg.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c
|
|
index 9c445b825..da6bed08e 100644
|
|
--- a/libfreerdp/codec/h264_ffmpeg.c
|
|
+++ b/libfreerdp/codec/h264_ffmpeg.c
|
|
@@ -100,10 +100,10 @@ static void libavcodec_destroy_encoder(H264_CONTEXT* h264)
|
|
|
|
if (sys->codecEncoderContext)
|
|
{
|
|
- avcodec_close(sys->codecEncoderContext);
|
|
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 69, 100)
|
|
avcodec_free_context(&sys->codecEncoderContext);
|
|
#else
|
|
+ avcodec_close(sys->codecEncoderContext);
|
|
av_free(sys->codecEncoderContext);
|
|
#endif
|
|
}
|
|
@@ -430,10 +430,10 @@ static void libavcodec_uninit(H264_CONTEXT* h264)
|
|
|
|
if (sys->codecDecoderContext)
|
|
{
|
|
- avcodec_close(sys->codecDecoderContext);
|
|
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 69, 100)
|
|
avcodec_free_context(&sys->codecDecoderContext);
|
|
#else
|
|
+ avcodec_close(sys->codecDecoderContext);
|
|
av_free(sys->codecDecoderContext);
|
|
#endif
|
|
}
|
|
--
|
|
2.47.3
|
|
|