forked from pool/freerdp
7365a41808
- Add Update_h264_to_use_new_FFMPEG_API.patch: Update h264 to use new FFMPEG API. Fixes build with "FFmpeg-6" as distro default. OBS-URL: https://build.opensuse.org/request/show/1082579 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=145
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
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
|
|
|