diff options
| author | Marc-André Moreau <marcandre.moreau@gmail.com> | 2011-08-17 19:28:49 +0400 |
|---|---|---|
| committer | Marc-André Moreau <marcandre.moreau@gmail.com> | 2011-08-17 19:28:49 +0400 |
| commit | 7dc67d166cc19d0c28b0522eda7af262a3ee6285 (patch) | |
| tree | f16fd2b7bbb8d924eee710f0b75153231782f603 | |
| parent | dfafaa6de24d6bdc8a69297509b0e001d36d8ea7 (diff) | |
| parent | 8e18e8c6d4865206cea4bb1d9b8a36b4e272b30e (diff) | |
Merge pull request #60 from floppym/ffmpeg-0.8
Fix compilation against libavcodec major version 53
| -rw-r--r-- | channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c | 6 |
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; |