gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/freerdp: fix build with ffmpeg git master.

Browse Source 
Package-Manager: portage-2.2.20.1
This commit is contained in:
Alexis Ballier
2015-09-16 22:56:52 +02:00
parent d0d22e04a1
commit 036cf8158e
2 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
net-misc/freerdp/files/freerdp-ffmpeg29.patch Normal file
View File

@@ -0,0 +1,40 @@
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",

4
net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
View File

@@ -46,7 +46,7 @@ RDEPEND="
xv? ( x11-libs/libXv )
)
)
ffmpeg? ( virtual/ffmpeg )
ffmpeg? ( >=virtual/ffmpeg-9 )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -80,7 +80,7 @@ DEPEND="${RDEPEND}
DOCS=( README )
PATCHES=( "${FILESDIR}/freerdp-armfp.patch" )
PATCHES=( "${FILESDIR}/freerdp-armfp.patch" "${FILESDIR}/freerdp-ffmpeg29.patch" )
src_configure() {
local mycmakeargs=(