summaryrefslogtreecommitdiff
path: root/net-misc/freerdp/files/freerdp-ffmpeg29.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/freerdp/files/freerdp-ffmpeg29.patch')
-rw-r--r--net-misc/freerdp/files/freerdp-ffmpeg29.patch42
1 files changed, 0 insertions, 42 deletions
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",