Skip to content

Commit

Permalink
Fix compilation against libavcodec major version 53
Browse files Browse the repository at this point in the history
FF_MM_* macros have been dropped.
  • Loading branch information
floppym committed Jul 23, 2011
1 parent b05747b commit 8e18e8c
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8e18e8c

Please sign in to comment.