net-misc/freerdp: remove old

Package-Manager: Portage-2.3.51_p14, Repoman-2.3.12_p5
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

7 files changed, 0 insertions, 395 deletions

diff --git a/net-misc/freerdp/files/1.2.1-gstreamer.patch b/net-misc/freerdp/files/1.2.1-gstreamer.patch
deleted file mode 100644
index cafe9702210a..000000000000
--- a/net-misc/freerdp/files/1.2.1-gstreamer.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From bea27fd919b64ee8d97996409e279e1e83d13594 Mon Sep 17 00:00:00 2001
-From: Jean-Louis Dupond <jean-louis@dupond.be>
-Date: Sun, 4 Oct 2015 18:17:33 +0200
-Subject: [PATCH] FindGStreamer_1_0: fix build failure for new gstreamer
- versions
-
----
- cmake/FindGStreamer_1_0.cmake | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
-index f7bf990..3aa8fc6 100644
---- a/cmake/FindGStreamer_1_0.cmake
-+++ b/cmake/FindGStreamer_1_0.cmake
-@@ -53,17 +53,17 @@ set(GSTREAMER_1_0_MINIMUM_VERSION 1.0.5)
- # Helper macro to find a Gstreamer plugin (or Gstreamer itself)
- #   _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_1_0_AUDIO")
- #   _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", or "gstreamer-video-1.0").
--#   _header is the component's header, relative to the gstreamer-1.0 directory (eg. "gst/gst.h").
- #   _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0")
--macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
-+macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
-     # FIXME: The QUIET keyword can be used once we require CMake 2.8.2.
--    pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
- 
--    find_path(${_component_prefix}_INCLUDE_DIRS
--        NAMES ${_header}
--        HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
--        PATH_SUFFIXES gstreamer-1.0
--    )
-+    string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
-+    if ("${CMAKE_MATCH_2}" STREQUAL "")
-+        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
-+    else ()
-+        pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
-+    endif ()
-+    set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS})
- 
-     find_library(${_component_prefix}_LIBRARIES
-         NAMES ${_library} gstreamer_android
-@@ -78,8 +78,8 @@ endmacro()
- # 1.1. Find headers and libraries
- set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
- find_package(Glib REQUIRED)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0)
- 
- # 1.2. Check Gstreamer version
- if (GSTREAMER_1_0_INCLUDE_DIRS)
-@@ -110,11 +110,11 @@ endif ()
- # 2. Find Gstreamer plugins
- # -------------------------
- 
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gstapp-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gstaudio-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gstfft-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gstvideo-1.0)
- 
- # ------------------------------------------------
- # 3. Process the COMPONENTS passed to FIND_PACKAGE
--- 
-2.6.3
-
diff --git a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch
deleted file mode 100644
index 9e565e5b05db..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 9bf9ff9e8a548ecb5306d0142e75cdc274e93ba1 Mon Sep 17 00:00:00 2001
-From: Valery Kartel <valery.kartel@gmail.com>
-Date: Wed, 26 Jul 2017 17:12:14 +0300
-Subject: [PATCH] Fix build with LibreSSL
-
----
- libfreerdp/crypto/crypto.c      | 2 +-
- winpr/libwinpr/utils/ssl.c      | 6 +++---
- winpr/tools/makecert/makecert.c | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c
-index 15e65d534..f3bb595b8 100644
---- a/libfreerdp/crypto/crypto.c
-+++ b/libfreerdp/crypto/crypto.c
-@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path)
- 	if (cert_ctx == NULL)
- 		goto end;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	OpenSSL_add_all_algorithms();
- #else
- 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index b674e21d5..78cbab1d8 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO
- 	}
- #endif
- 	/* SSL_load_error_strings() is void */
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	SSL_load_error_strings();
- 	/* SSL_library_init() always returns "1" */
- 	SSL_library_init();
-@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
- #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
- 		_winpr_openssl_cleanup_locking();
- #endif
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		CRYPTO_cleanup_all_ex_data();
- 		ERR_free_strings();
- 		EVP_cleanup();
-@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
- #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
- 	if (flags & WINPR_SSL_CLEANUP_THREAD)
- 	{
--#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		ERR_remove_state(0);
- #else
- 		ERR_remove_thread_state(NULL);
-diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c
-index a9efb352c..c9e38200a 100644
---- a/winpr/tools/makecert/makecert.c
-+++ b/winpr/tools/makecert/makecert.c
-@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, char* pa
- 				printf("Using default export password \"password\"\n");
- 			}
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 			OpenSSL_add_all_algorithms();
- 			OpenSSL_add_all_ciphers();
- 			OpenSSL_add_all_digests();
-@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv)
- 		key_length = atoi(arg->Value);
- 	}
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
- #else
- 	{
-@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv)
- 	{
- 		ASN1_TIME* before;
- 		ASN1_TIME* after;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		before = X509_get_notBefore(context->x509);
- 		after = X509_get_notAfter(context->x509);
- #else
--- 
-2.14.1
-
diff --git a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch b/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch
deleted file mode 100644
index 59887f698ec9..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 088c3940d9b488e8a83b9cefaa7271f955d1971c Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
-Date: Wed, 14 Mar 2018 13:39:23 +0100
-Subject: [PATCH] fix nla: don't use server version
-
-FreeRDP currently only supports CredSSP protocol version 3. However the
-current implementation always sent back the version received by the
-server indicating that this version was supported.
-With recent windows updates applied the protocol changed and this approach
-doesn't work anymore (see
-https://msdn.microsoft.com/en-us/library/mt752485.aspx for protocol changes).
-
-With this fix FreeRDP always sends version 3 as supported version.
-
-Credit goes to @mfleisz.
-
-Fixes #4449
----
- libfreerdp/core/nla.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
-index 47e087062..8a69f2f6e 100644
---- a/libfreerdp/core/nla.c
-+++ b/libfreerdp/core/nla.c
-@@ -1663,15 +1663,19 @@ BOOL nla_send(rdpNla* nla)
- static int nla_decode_ts_request(rdpNla* nla, wStream* s)
- {
- 	int length;
-+	UINT32 version = 0;
- 
- 	/* TSRequest */
- 	if (!ber_read_sequence_tag(s, &length) ||
- 	    !ber_read_contextual_tag(s, 0, &length, TRUE) ||
--	    !ber_read_integer(s, &nla->version))
-+	    !ber_read_integer(s, &version))
- 	{
- 		return -1;
- 	}
- 
-+	if (version < nla->version)
-+		nla->version = version;
-+
- 	/* [1] negoTokens (NegoData) */
- 	if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)
- 	{
--- 
-2.16.2
-
diff --git a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch b/net-misc/freerdp/files/2.0.0-rc1-libressl.patch
deleted file mode 100644
index 76e2514ef2b0..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bfe3af4c72b45e33321962644d864843e1c9ce3d Mon Sep 17 00:00:00 2001
-From: Greg V <greg@unrelenting.technology>
-Date: Fri, 1 Dec 2017 18:34:48 +0300
-Subject: [PATCH] Fix LibreSSL build
-
-LibreSSL does not support FIPS mode.
----
- winpr/libwinpr/utils/ssl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index f749939ac..194f82609 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO
- 
- 	if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
- 	{
--#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!");
- #else
- 		WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
-@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
- 
- BOOL winpr_FIPSMode(void)
- {
--#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	return FALSE;
- #else
- 	return (FIPS_mode() == 1);
--- 
-2.15.1
-
diff --git a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch b/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch
deleted file mode 100644
index b63771d08187..000000000000
--- a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 28 Jul 2017 16:31:41 -0400
-Subject: [PATCH] Fix gstreamer-1.0 detection
-
----
- cmake/FindGStreamer_1_0.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
-index 3aa8fc6dc..6fbc0ecc5 100644
---- a/cmake/FindGStreamer_1_0.cmake
-+++ b/cmake/FindGStreamer_1_0.cmake
-@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
- 
-     string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
-     if ("${CMAKE_MATCH_2}" STREQUAL "")
--        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
-+        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}")
-     else ()
-         pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
-     endif ()
--- 
-2.13.3
-
diff --git a/net-misc/freerdp/files/freerdp-armfp.patch b/net-misc/freerdp/files/freerdp-armfp.patch
deleted file mode 100644
index 1a367d5600c3..000000000000
--- a/net-misc/freerdp/files/freerdp-armfp.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 2355b54f8516a6e1c600df8f26ac7d56916bfd99 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 1 May 2015 17:35:21 -0400
-Subject: [PATCH] Remove the ARM_FP_ABI option
-
-It's unclear why this option would be necessary, and it causes problems
-when people do not match it to their toolchain and CFLAGS.
-
-To set the float abi, either use a toolchain with an appropriate default
-or set the float-abi option in the CFLAGS environment variable.
-
-This should resolve #2586.
----
- cmake/ConfigOptions.cmake           | 6 ------
- libfreerdp/CMakeLists.txt           | 4 ++--
- packaging/deb/freerdp-nightly/rules | 7 -------
- 3 files changed, 2 insertions(+), 15 deletions(-)
-
-diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
-index b51a46b..cef6ba6 100644
---- a/cmake/ConfigOptions.cmake
-+++ b/cmake/ConfigOptions.cmake
-@@ -29,12 +29,6 @@ if(TARGET_ARCH MATCHES "ARM")
- 	else()
- 		option(WITH_NEON "Enable NEON optimization." OFF)
- 	endif()
--	if (NOT DEFINED ARM_FP_ABI)
--		set(ARM_FP_ABI "softfp" CACHE STRING "Floating point ABI to use on arm")
--	else()
--		set(ARM_FP_ABI ${ARM_FP_API} CACHE STRING "Floating point ABI to use on arm")
--	endif()
--	mark_as_advanced(ARM_FP_ABI)
- else()
- 	if(NOT APPLE)
- 		option(WITH_IPP "Use Intel Performance Primitives." OFF)
-diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
-index a1cbd9d..112b75a 100644
---- a/libfreerdp/CMakeLists.txt
-+++ b/libfreerdp/CMakeLists.txt
-@@ -156,7 +156,7 @@ if(WITH_SSE2)
- endif()
- 
- if(WITH_NEON)
--	set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -mfloat-abi=${ARM_FP_ABI} -Wno-unused-variable" )
-+	set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -Wno-unused-variable" )
- 	set(CODEC_SRCS ${CODEC_SRCS} ${CODEC_NEON_SRCS})
- endif()
- 
-@@ -236,7 +236,7 @@ if(WITH_SSE2)
- 	endif()
- elseif(WITH_NEON)
- 	if(CMAKE_COMPILER_IS_GNUCC)
--	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon -mfloat-abi=${ARM_FP_ABI}")
-+	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon")
- 	endif()
- 	# TODO: Add MSVC equivalent
- endif()
-diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules
-index 4366f63..44ceb56 100755
---- a/packaging/deb/freerdp-nightly/rules
-+++ b/packaging/deb/freerdp-nightly/rules
-@@ -1,11 +1,5 @@
- #!/usr/bin/make -f
- 
--DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
--ifneq (,$(filter armhf,$(DEB_HOST_ARCH)))
--ARM_FLOAT_ABI = -DARM_FP_ABI=hard
--else
--ARM_FLOAT_ABI =
--endif
- NULL =
- 
- DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
-@@ -26,7 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
-                           -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \
-                           -DCMAKE_INSTALL_INCLUDEDIR=include \
-                           -DCMAKE_INSTALL_LIBDIR=lib \
--                          $(ARM_FLOAT_ABI) \
-                           $(NULL)
- 
- %:
--- 
-2.5.0
-
diff --git a/net-misc/freerdp/files/freerdp-ffmpeg29.patch b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
deleted file mode 100644
index e4d81bd1c2aa..000000000000
--- a/net-misc/freerdp/files/freerdp-ffmpeg29.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/FreeRDP/FreeRDP/pull/2895
-
-Index: freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-===================================================================
---- freerdp-1.2.1_pre20150326.orig/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -102,7 +102,7 @@ static BOOL tsmf_ffmpeg_init_video_strea
- 	mdecoder->codec_context->bit_rate = media_type->BitRate;
- 	mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator;
- 	mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
--	mdecoder->frame = avcodec_alloc_frame();
-+	mdecoder->frame = av_frame_alloc();
- 	return TRUE;
- }
- 
-@@ -320,7 +320,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
- 								 mdecoder->codec_context->width, mdecoder->codec_context->height);
- 		mdecoder->decoded_data = malloc(mdecoder->decoded_size);
- 		ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
--		frame = avcodec_alloc_frame();
-+		frame = av_frame_alloc();
- 		avpicture_fill((AVPicture*) frame, mdecoder->decoded_data,
- 					   mdecoder->codec_context->pix_fmt,
- 					   mdecoder->codec_context->width, mdecoder->codec_context->height);
-@@ -389,7 +389,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
- 									(int16_t *) dst, &frame_size, src, src_size);
- #else
- 		{
--			AVFrame *decoded_frame = avcodec_alloc_frame();
-+			AVFrame *decoded_frame = av_frame_alloc();
- 			int got_frame = 0;
- 			AVPacket pkt;
- 			av_init_packet(&pkt);
-@@ -469,7 +469,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo
- 
- 	switch (mdecoder->codec_context->pix_fmt)
- 	{
--		case PIX_FMT_YUV420P:
-+		case AV_PIX_FMT_YUV420P:
- 			return RDP_PIXFMT_I420;
- 		default:
- 			WLog_ERR(TAG, "unsupported pixel format %u",