freerdp: Added patch for ffmpeg > 0.10.8
This commit is contained in:
parent
1e0d0e4268
commit
0c180537ef
@ -1 +1,2 @@
|
||||
c11f9c0d997499c89c19edb82f65dfd1 ffmpeg.patch
|
||||
08f0e07d8d77e142f7dc39e4033a458d freerdp-1.0.2.tar.gz
|
||||
|
@ -6,10 +6,12 @@
|
||||
|
||||
name=freerdp
|
||||
version=1.0.2
|
||||
release=1
|
||||
source=(http://pub.freerdp.com/releases/freerdp-$version.tar.gz)
|
||||
release=2
|
||||
source=(http://pub.freerdp.com/releases/freerdp-$version.tar.gz ffmpeg.patch)
|
||||
|
||||
build() {
|
||||
patch -p0 -i $SRC/ffmpeg.patch
|
||||
|
||||
mkdir build; cd build
|
||||
|
||||
cmake ../$name-$version \
|
||||
|
37
freerdp/ffmpeg.patch
Normal file
37
freerdp/ffmpeg.patch
Normal file
@ -0,0 +1,37 @@
|
||||
diff -u -r 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-11-09 20:03:58.460168637 +0900
|
||||
+++ freerdp-1.0.2/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-11-09 20:08:51.624184926 +0900
|
||||
@@ -34,12 +34,21 @@
|
||||
#define AVMEDIA_TYPE_AUDIO 1
|
||||
#endif
|
||||
|
||||
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
|
||||
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
typedef struct _TSMFFFmpegDecoder
|
||||
{
|
||||
ITSMFDecoder iface;
|
||||
|
||||
int media_type;
|
||||
+#if LIBAVCODEC_VERSION_MAJOR > 54
|
||||
+ enum AVCodecID codec_id;
|
||||
+#else
|
||||
enum CodecID codec_id;
|
||||
+#endif
|
||||
AVCodecContext* codec_context;
|
||||
AVCodec* codec;
|
||||
AVFrame* frame;
|
||||
@@ -89,7 +98,11 @@
|
||||
mdecoder->codec_context->block_align = media_type->BlockAlign;
|
||||
|
||||
#ifdef AV_CPU_FLAG_SSE2
|
||||
+#if LIBAVCODEC_VERSION_MAJOR > 54
|
||||
+ av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2);
|
||||
+#else
|
||||
mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
|
||||
+#endif
|
||||
#else
|
||||
#if LIBAVCODEC_VERSION_MAJOR < 53
|
||||
mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
|
Loading…
x
Reference in New Issue
Block a user