diff options
| author | Philip van der Hoeven <philip@vd-hoeven.nl> | 2015-02-07 05:24:37 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-02-07 05:24:37 +0700 |
| commit | 1e9796e0d34ed346b4fc7dc7de0a609a18a73f5d (patch) | |
| tree | 7285f0dfe8ba312a4ab8ccf5585dba5eb0641cda /network/freerdp/patch-ffmpeg-2.0.diff | |
| parent | 4de4267021edd5d199244fe9725fb34097ed0037 (diff) | |
| download | slackbuilds-1e9796e0d34ed346b4fc7dc7de0a609a18a73f5d.tar.gz | |
network/freerdp: Updated for version 1.2.0_beta1_android9.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network/freerdp/patch-ffmpeg-2.0.diff')
| -rw-r--r-- | network/freerdp/patch-ffmpeg-2.0.diff | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/network/freerdp/patch-ffmpeg-2.0.diff b/network/freerdp/patch-ffmpeg-2.0.diff deleted file mode 100644 index db579217e5..0000000000 --- a/network/freerdp/patch-ffmpeg-2.0.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2013-07-10 01:00:21.000000000 -0700 -+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2013-08-12 22:26:28.000000000 -0700 -@@ -43,12 +43,20 @@ - #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; -@@ -99,8 +107,12 @@ - mdecoder->codec_context->block_align = media_type->BlockAlign; - - #ifdef AV_CPU_FLAG_SSE2 -+#if LIBAVCODEC_VERSION_MAJOR < 55 - mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2; - #else -+ av_set_cpu_flags_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; - #else |