Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FreeRDP/FreeRDP-old.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppymaster@gmail.com>2011-07-23 05:42:00 +0400
committerMike Gilbert <floppymaster@gmail.com>2011-07-23 05:42:00 +0400
commit8e18e8c6d4865206cea4bb1d9b8a36b4e272b30e (patch)
tree29cbe7a53924c5a853aeae6e5f847b289fc79574
parentb05747b55ccea8d2f2b830f89d3c0eb622d66784 (diff)
Fix compilation against libavcodec major version 53
FF_MM_* macros have been dropped.
-rw-r--r--channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
index a85dfc9..3c2b962 100644
--- a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
+++ b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
@@ -90,10 +90,12 @@ tsmf_ffmpeg_init_audio_stream(ITSMFDecoder * decoder, const TS_AM_MEDIA_TYPE * m
/* FFmpeg's float_to_int16_interleave_sse2 would crash at least in WMA decoder.
We disable sse2 to workaround it, however this should be further investigated. */
-#if LIBAVCODEC_VERSION_MAJOR < 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR <= 20)
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 24, 0)
mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
-#else
+#elif LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 87, 1)
mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
+#else
+ mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
#endif
return 0;