freerdp: dropped

2020-04-02 00:48:39 +09:00 · 2020-04-02 00:48:39 +09:00 · ff8d2d2b80
commit ff8d2d2b80
parent dfbbb89068
4 changed files with 0 additions and 387 deletions
--- a/freerdp/.footprint
+++ b/freerdp/.footprint
@ -1,167 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
-rwxr-xr-x	root/root	usr/bin/xfreerdp
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/freerdp/
-rw-r--r--	root/root	usr/include/freerdp/altsec.h
-rw-r--r--	root/root	usr/include/freerdp/api.h
-drwxr-xr-x	root/root	usr/include/freerdp/cache/
-rw-r--r--	root/root	usr/include/freerdp/cache/bitmap.h
-rw-r--r--	root/root	usr/include/freerdp/cache/brush.h
-rw-r--r--	root/root	usr/include/freerdp/cache/cache.h
-rw-r--r--	root/root	usr/include/freerdp/cache/glyph.h
-rw-r--r--	root/root	usr/include/freerdp/cache/offscreen.h
-rw-r--r--	root/root	usr/include/freerdp/cache/palette.h
-rw-r--r--	root/root	usr/include/freerdp/cache/pointer.h
-drwxr-xr-x	root/root	usr/include/freerdp/channels/
-rw-r--r--	root/root	usr/include/freerdp/channels/channels.h
-rw-r--r--	root/root	usr/include/freerdp/channels/wtsvc.h
-drwxr-xr-x	root/root	usr/include/freerdp/codec/
-rw-r--r--	root/root	usr/include/freerdp/codec/bitmap.h
-rw-r--r--	root/root	usr/include/freerdp/codec/color.h
-rw-r--r--	root/root	usr/include/freerdp/codec/nsc.h
-rw-r--r--	root/root	usr/include/freerdp/codec/rfx.h
-rw-r--r--	root/root	usr/include/freerdp/constants.h
-rw-r--r--	root/root	usr/include/freerdp/dvc.h
-rw-r--r--	root/root	usr/include/freerdp/extension.h
-rw-r--r--	root/root	usr/include/freerdp/freerdp.h
-drwxr-xr-x	root/root	usr/include/freerdp/gdi/
-rw-r--r--	root/root	usr/include/freerdp/gdi/16bpp.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/32bpp.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/8bpp.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/bitmap.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/brush.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/clipping.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/dc.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/drawing.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/gdi.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/line.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/palette.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/pen.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/region.h
-rw-r--r--	root/root	usr/include/freerdp/gdi/shape.h
-rw-r--r--	root/root	usr/include/freerdp/graphics.h
-rw-r--r--	root/root	usr/include/freerdp/input.h
-drwxr-xr-x	root/root	usr/include/freerdp/kbd/
-rw-r--r--	root/root	usr/include/freerdp/kbd/kbd.h
-rw-r--r--	root/root	usr/include/freerdp/kbd/layouts.h
-rw-r--r--	root/root	usr/include/freerdp/kbd/locales.h
-rw-r--r--	root/root	usr/include/freerdp/kbd/vkcodes.h
-rw-r--r--	root/root	usr/include/freerdp/listener.h
-rw-r--r--	root/root	usr/include/freerdp/peer.h
-drwxr-xr-x	root/root	usr/include/freerdp/plugins/
-rw-r--r--	root/root	usr/include/freerdp/plugins/cliprdr.h
-rw-r--r--	root/root	usr/include/freerdp/plugins/tsmf.h
-rw-r--r--	root/root	usr/include/freerdp/pointer.h
-rw-r--r--	root/root	usr/include/freerdp/primary.h
-rw-r--r--	root/root	usr/include/freerdp/rail.h
-drwxr-xr-x	root/root	usr/include/freerdp/rail/
-rw-r--r--	root/root	usr/include/freerdp/rail/icon.h
-rw-r--r--	root/root	usr/include/freerdp/rail/rail.h
-rw-r--r--	root/root	usr/include/freerdp/rail/window.h
-rw-r--r--	root/root	usr/include/freerdp/rail/window_list.h
-rw-r--r--	root/root	usr/include/freerdp/secondary.h
-rw-r--r--	root/root	usr/include/freerdp/settings.h
-rw-r--r--	root/root	usr/include/freerdp/svc.h
-rw-r--r--	root/root	usr/include/freerdp/types.h
-rw-r--r--	root/root	usr/include/freerdp/update.h
-drwxr-xr-x	root/root	usr/include/freerdp/utils/
-rw-r--r--	root/root	usr/include/freerdp/utils/args.h
-rw-r--r--	root/root	usr/include/freerdp/utils/bitmap.h
-rw-r--r--	root/root	usr/include/freerdp/utils/blob.h
-rw-r--r--	root/root	usr/include/freerdp/utils/debug.h
-rw-r--r--	root/root	usr/include/freerdp/utils/dsp.h
-rw-r--r--	root/root	usr/include/freerdp/utils/event.h
-rw-r--r--	root/root	usr/include/freerdp/utils/file.h
-rw-r--r--	root/root	usr/include/freerdp/utils/hexdump.h
-rw-r--r--	root/root	usr/include/freerdp/utils/list.h
-rw-r--r--	root/root	usr/include/freerdp/utils/load_plugin.h
-rw-r--r--	root/root	usr/include/freerdp/utils/memory.h
-rw-r--r--	root/root	usr/include/freerdp/utils/mutex.h
-rw-r--r--	root/root	usr/include/freerdp/utils/passphrase.h
-rw-r--r--	root/root	usr/include/freerdp/utils/pcap.h
-rw-r--r--	root/root	usr/include/freerdp/utils/print.h
-rw-r--r--	root/root	usr/include/freerdp/utils/profiler.h
-rw-r--r--	root/root	usr/include/freerdp/utils/rail.h
-rw-r--r--	root/root	usr/include/freerdp/utils/rect.h
-rw-r--r--	root/root	usr/include/freerdp/utils/registry.h
-rw-r--r--	root/root	usr/include/freerdp/utils/semaphore.h
-rw-r--r--	root/root	usr/include/freerdp/utils/signal.h
-rw-r--r--	root/root	usr/include/freerdp/utils/sleep.h
-rw-r--r--	root/root	usr/include/freerdp/utils/stopwatch.h
-rw-r--r--	root/root	usr/include/freerdp/utils/stream.h
-rw-r--r--	root/root	usr/include/freerdp/utils/string.h
-rw-r--r--	root/root	usr/include/freerdp/utils/svc_plugin.h
-rw-r--r--	root/root	usr/include/freerdp/utils/thread.h
-rw-r--r--	root/root	usr/include/freerdp/utils/unicode.h
-rw-r--r--	root/root	usr/include/freerdp/utils/wait_obj.h
-rw-r--r--	root/root	usr/include/freerdp/window.h
-drwxr-xr-x	root/root	usr/lib64/
-drwxr-xr-x	root/root	usr/lib64/freerdp/
-rwxr-xr-x	root/root	usr/lib64/freerdp/audin.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/audin_alsa.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/cliprdr.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/disk.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/drdynvc.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/parallel.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/printer.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/rail.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/rdpdbg.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/rdpdr.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/rdpsnd.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/rdpsnd_alsa.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/serial.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/tsmf.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/tsmf_alsa.so
-rwxr-xr-x	root/root	usr/lib64/freerdp/tsmf_ffmpeg.so
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-cache.so -> libfreerdp-cache.so.1.0
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-cache.so.1.0 -> libfreerdp-cache.so.1.0.2
-rwxr-xr-x	root/root	usr/lib64/libfreerdp-cache.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-channels.so -> libfreerdp-channels.so.1.0
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-channels.so.1.0 -> libfreerdp-channels.so.1.0.2
-rwxr-xr-x	root/root	usr/lib64/libfreerdp-channels.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-codec.so -> libfreerdp-codec.so.1.0
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-codec.so.1.0 -> libfreerdp-codec.so.1.0.2
-rwxr-xr-x	root/root	usr/lib64/libfreerdp-codec.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-core.so -> libfreerdp-core.so.1.0
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-core.so.1.0 -> libfreerdp-core.so.1.0.2
-rwxr-xr-x	root/root	usr/lib64/libfreerdp-core.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-gdi.so -> libfreerdp-gdi.so.1.0
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-gdi.so.1.0 -> libfreerdp-gdi.so.1.0.2
-rwxr-xr-x	root/root	usr/lib64/libfreerdp-gdi.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-kbd.so -> libfreerdp-kbd.so.1.0
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-kbd.so.1.0 -> libfreerdp-kbd.so.1.0.2
-rwxr-xr-x	root/root	usr/lib64/libfreerdp-kbd.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-rail.so -> libfreerdp-rail.so.1.0
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-rail.so.1.0 -> libfreerdp-rail.so.1.0.2
-rwxr-xr-x	root/root	usr/lib64/libfreerdp-rail.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-utils.so -> libfreerdp-utils.so.1.0
-lrwxrwxrwx	root/root	usr/lib64/libfreerdp-utils.so.1.0 -> libfreerdp-utils.so.1.0.2
-rwxr-xr-x	root/root	usr/lib64/libfreerdp-utils.so.1.0.2
-drwxr-xr-x	root/root	usr/lib64/pkgconfig/
-rw-r--r--	root/root	usr/lib64/pkgconfig/freerdp.pc
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/freerdp/
-drwxr-xr-x	root/root	usr/share/freerdp/keymaps/
-rw-r--r--	root/root	usr/share/freerdp/keymaps/aliases
-rw-r--r--	root/root	usr/share/freerdp/keymaps/amiga
-rw-r--r--	root/root	usr/share/freerdp/keymaps/ataritt
-drwxr-xr-x	root/root	usr/share/freerdp/keymaps/digital_vndr/
-rw-r--r--	root/root	usr/share/freerdp/keymaps/digital_vndr/lk
-rw-r--r--	root/root	usr/share/freerdp/keymaps/digital_vndr/pc
-rw-r--r--	root/root	usr/share/freerdp/keymaps/empty
-rw-r--r--	root/root	usr/share/freerdp/keymaps/evdev
-rw-r--r--	root/root	usr/share/freerdp/keymaps/fujitsu
-rw-r--r--	root/root	usr/share/freerdp/keymaps/hp
-rw-r--r--	root/root	usr/share/freerdp/keymaps/ibm
-rw-r--r--	root/root	usr/share/freerdp/keymaps/macintosh
-rw-r--r--	root/root	usr/share/freerdp/keymaps/macosx
-drwxr-xr-x	root/root	usr/share/freerdp/keymaps/sgi_vndr/
-rw-r--r--	root/root	usr/share/freerdp/keymaps/sgi_vndr/indigo
-rw-r--r--	root/root	usr/share/freerdp/keymaps/sgi_vndr/indy
-rw-r--r--	root/root	usr/share/freerdp/keymaps/sgi_vndr/iris
-rw-r--r--	root/root	usr/share/freerdp/keymaps/sony
-rw-r--r--	root/root	usr/share/freerdp/keymaps/sun
-rw-r--r--	root/root	usr/share/freerdp/keymaps/xfree86
-rw-r--r--	root/root	usr/share/freerdp/keymaps/xfree98
-rw-r--r--	root/root	usr/share/freerdp/keymaps/xkb.pl
--- a/freerdp/.signature
+++ b/freerdp/.signature
@ -1,6 +0,0 @@
-untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fnCDMGQLrJGZftVx6djQI6OHSHyWeJx6+01y3fv+eAEtBwVnAVxEcNzBS4fO87nc6H35VzC5qubm3VjOoze2Ao=
-SHA256 (Pkgfile) = aa6313ab07a0baed029b491b801e4262f00cf52982e78cdf68d81bd71d09f63c
-SHA256 (.footprint) = 403f893c0b2f2d9ae8ee84962779d0a786ae9a2ee89916a58bf3f134f88054bf
-SHA256 (freerdp-1.0.2.tar.gz) = d519f2dca794366a15825b8c9f751dfd06018fd4fa3890840f3f6c6e0bcfe9d5
-SHA256 (ffmpeg.patch) = b144699f853d757344470555ac029e3e93c68104595734ba66871986ca449be9
--- a/freerdp/Pkgfile
+++ b/freerdp/Pkgfile
@ -1,37 +0,0 @@
-# Description:	Remote desktop protocol implementation
-# URL:		http://www.freerdp.com/
-# Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on:	cmake xorg-libx11 xorg-libxrender xorg-libxcursor xorg-libxext
-# Optional:	ffmpeg alsa-lib cups directfb neon pulseaudio xmlto
-
-name=freerdp
-version=1.0.2
-release=2
-source=(http://pub.freerdp.com/releases/freerdp-$version.tar.gz ffmpeg.patch)
-
-build() {
-	# fix build with different versions of ffmpeg
-	patch -p0 -i $SRC/ffmpeg.patch
-
-	# fix for even newer ffmpeg
-	sed -ri \
-		's/([^a-zA-Z_+])(CODEC_CAP_TRUNCATED|CODEC_FLAG_TRUNCATED|CODEC_FLAG_LOOP_FILTER)/\1AV_\2/g' \
-		$name-$version/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
-
-	mkdir build; cd build
-
-	cmake ../$name-$version \
-		-DCMAKE_BUILD_TYPE=RELEASE \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DWITH_PULSEAUDIO=$([ -f /usr/include/pulse/pulseaudio.h ] && echo "ON" || echo "OFF") \
-		-DWITH_CUPS=$([ -f /usr/include/cups/cups.h ] && echo "ON" || echo "OFF") \
-		-DWITH_ALSA=$([ -f /usr/include/alsa/version.h ] && echo "ON" || echo "OFF") \
-		-DWITH_FFMPEG=$([ -f /usr/include/libavcodec/avcodec.h ] && echo "ON" || echo "OFF") \
-		-DWITH_SSE2=$(grep -q '\bsse2\b' /proc/cpuinfo && echo ON || echo OFF) \
-		-DWITH_SSE2_TARGET=$(grep -q '\bsse2\b' /proc/cpuinfo && echo ON || echo OFF) \
-		-DWITH_SERVER=OFF \
-		-DWITH_CLIENT=ON
-	make
-	make DESTDIR=$PKG install
-}
--- a/freerdp/ffmpeg.patch
+++ b/freerdp/ffmpeg.patch
@ -1,177 +0,0 @@
-diff -ru freerdp-1.0.2.orig/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c freerdp-1.0.2/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
--- freerdp-1.0.2.orig/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2013-01-03 06:46:59.000000000 +0900
-+++ freerdp-1.0.2/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2017-05-02 14:47:47.897325525 +0900
-@@ -34,12 +34,39 @@
- #define AVMEDIA_TYPE_AUDIO 1
- #endif
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 54
-+#define MAX_AUDIO_FRAME_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#else
-+#define MAX_AUDIO_FRAME_SIZE 192000
-+#endif
-+
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-+#define AV_CODEC_ID_VC1 CODEC_ID_VC1
-+#define AV_CODEC_ID_WMAV2 CODEC_ID_WMAV2
-+#define AV_CODEC_ID_WMAPRO CODEC_ID_WMAPRO
-+#define AV_CODEC_ID_MP3 CODEC_ID_MP3
-+#define AV_CODEC_ID_MP2 CODEC_ID_MP2
-+#define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO
-+#define AV_CODEC_ID_WMV3 CODEC_ID_WMV3
-+#define AV_CODEC_ID_AAC CODEC_ID_AAC
-+#define AV_CODEC_ID_H264 CODEC_ID_H264
-+#define AV_CODEC_ID_AC3 CODEC_ID_AC3
-+#endif
-+
-+#if LIBAVUTIL_VERSION_MAJOR < 52
-+#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
-+#endif
-+
- typedef struct _TSMFFFmpegDecoder
- {
- 	ITSMFDecoder iface;
- 
- 	int media_type;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- 	enum CodecID codec_id;
-+#else
-+	enum AVCodecID codec_id;
-+#endif
- 	AVCodecContext* codec_context;
- 	AVCodec* codec;
- 	AVFrame* frame;
-@@ -54,7 +81,7 @@
- {
- 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
- 
-	mdecoder->codec_context = avcodec_alloc_context();
-+	mdecoder->codec_context = avcodec_alloc_context3(NULL);
- 	if (!mdecoder->codec_context)
- 	{
- 		DEBUG_WARN("avcodec_alloc_context failed.");
-@@ -73,8 +100,11 @@
- 	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;
-
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- 	mdecoder->frame = avcodec_alloc_frame();
-+#else
-+	mdecoder->frame = av_frame_alloc();
-+#endif
- 
- 	return true;
- }
-@@ -88,6 +118,7 @@
- 	mdecoder->codec_context->channels = media_type->Channels;
- 	mdecoder->codec_context->block_align = media_type->BlockAlign;
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #ifdef AV_CPU_FLAG_SSE2
- 	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
- #else
-@@ -97,6 +128,13 @@
- 	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
- #endif
- #endif
-+#else  /* LIBAVCODEC_VERSION_MAJOR < 55 */
-+#ifdef AV_CPU_FLAG_SSE2
-+	av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMXEXT);
-+#else
-+	av_set_cpu_flags_mask(FF_MM_SSE2 | FF_MM_MMX2);
-+#endif
-+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
- 
- 	return true;
- }
-@@ -203,28 +241,28 @@
- 	switch (media_type->SubType)
- 	{
- 		case TSMF_SUB_TYPE_WVC1:
-			mdecoder->codec_id = CODEC_ID_VC1;
-+			mdecoder->codec_id = AV_CODEC_ID_VC1;
- 			break;
- 		case TSMF_SUB_TYPE_WMA2:
-			mdecoder->codec_id = CODEC_ID_WMAV2;
-+			mdecoder->codec_id = AV_CODEC_ID_WMAV2;
- 			break;
- 		case TSMF_SUB_TYPE_WMA9:
-			mdecoder->codec_id = CODEC_ID_WMAPRO;
-+			mdecoder->codec_id = AV_CODEC_ID_WMAPRO;
- 			break;
- 		case TSMF_SUB_TYPE_MP3:
-			mdecoder->codec_id = CODEC_ID_MP3;
-+			mdecoder->codec_id = AV_CODEC_ID_MP3;
- 			break;
- 		case TSMF_SUB_TYPE_MP2A:
-			mdecoder->codec_id = CODEC_ID_MP2;
-+			mdecoder->codec_id = AV_CODEC_ID_MP2;
- 			break;
- 		case TSMF_SUB_TYPE_MP2V:
-			mdecoder->codec_id = CODEC_ID_MPEG2VIDEO;
-+			mdecoder->codec_id = AV_CODEC_ID_MPEG2VIDEO;
- 			break;
- 		case TSMF_SUB_TYPE_WMV3:
-			mdecoder->codec_id = CODEC_ID_WMV3;
-+			mdecoder->codec_id = AV_CODEC_ID_WMV3;
- 			break;
- 		case TSMF_SUB_TYPE_AAC:
-			mdecoder->codec_id = CODEC_ID_AAC;
-+			mdecoder->codec_id = AV_CODEC_ID_AAC;
- 			/* For AAC the pFormat is a HEAACWAVEINFO struct, and the codec data
- 			   is at the end of it. See
- 			   http://msdn.microsoft.com/en-us/library/dd757806.aspx */
-@@ -236,10 +274,10 @@
- 			break;
- 		case TSMF_SUB_TYPE_H264:
- 		case TSMF_SUB_TYPE_AVC1:
-			mdecoder->codec_id = CODEC_ID_H264;
-+			mdecoder->codec_id = AV_CODEC_ID_H264;
- 			break;
- 		case TSMF_SUB_TYPE_AC3:
-			mdecoder->codec_id = CODEC_ID_AC3;
-+			mdecoder->codec_id = AV_CODEC_ID_AC3;
- 			break;
- 		default:
- 			return false;
-@@ -299,7 +337,12 @@
- 		mdecoder->decoded_size = avpicture_get_size(mdecoder->codec_context->pix_fmt,
- 			mdecoder->codec_context->width, mdecoder->codec_context->height);
- 		mdecoder->decoded_data = xzalloc(mdecoder->decoded_size);
-+
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- 		frame = avcodec_alloc_frame();
-+#else
-+		frame = av_frame_alloc();
-+#endif
- 		avpicture_fill((AVPicture *) frame, mdecoder->decoded_data,
- 			mdecoder->codec_context->pix_fmt,
- 			mdecoder->codec_context->width, mdecoder->codec_context->height);
-@@ -337,7 +380,7 @@
- #endif
- 
- 	if (mdecoder->decoded_size_max == 0)
-		mdecoder->decoded_size_max = AVCODEC_MAX_AUDIO_FRAME_SIZE + 16;
-+		mdecoder->decoded_size_max = MAX_AUDIO_FRAME_SIZE + 16;
- 	mdecoder->decoded_data = xzalloc(mdecoder->decoded_size_max);
- 	/* align the memory for SSE2 needs */
- 	dst = (uint8*) (((uintptr_t)mdecoder->decoded_data + 15) & ~ 0x0F);
-@@ -348,7 +391,7 @@
- 	while (src_size > 0)
- 	{
- 		/* Ensure enough space for decoding */
-		if (mdecoder->decoded_size_max - mdecoder->decoded_size < AVCODEC_MAX_AUDIO_FRAME_SIZE)
-+		if (mdecoder->decoded_size_max - mdecoder->decoded_size < MAX_AUDIO_FRAME_SIZE)
- 		{
- 			mdecoder->decoded_size_max = mdecoder->decoded_size_max * 2 + 16;
- 			mdecoder->decoded_data = xrealloc(mdecoder->decoded_data, mdecoder->decoded_size_max);
-@@ -445,7 +488,7 @@
- 
- 	switch (mdecoder->codec_context->pix_fmt)
- 	{
-		case PIX_FMT_YUV420P:
-+		case AV_PIX_FMT_YUV420P:
- 			return RDP_PIXFMT_I420;
- 
- 		default: