wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-03 19:32:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

freerdp: fix build with ffmpeg>=3.0

Browse source
This commit is contained in:
Juergen Buchmueller 2016-09-22 19:16:29 +02:00
parent d384017615
commit 70d3c88c64
2 changed files with 61 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
srcpkgs/freerdp/patches/ffmpeg3.x.patch Normal file
View file

@ -0,0 +1,61 @@
--- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2016-09-22 19:09:13.429317530 +0200
+++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2016-09-22 19:11:31.976367968 +0200
@@ -195,28 +195,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 */
@@ -228,10 +228,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;
@@ -438,7 +438,7 @@
switch (mdecoder->codec_context->pix_fmt)
{
- case PIX_FMT_YUV420P:
+ case AV_PIX_FMT_YUV420P:
return RDP_PIXFMT_I420;
default:

2
srcpkgs/freerdp/template
View file

@ -1,5 +1,3 @@
broken="ffmpeg3"
# Template file for 'freerdp' # Template file for 'freerdp'
pkgname=freerdp pkgname=freerdp
version=1.0.2 version=1.0.2