diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp index b0b6b91e5f..275bbcaa26 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp @@ -50,14 +50,6 @@ static int sDumpedPackets = 0; #endif -#ifdef __x86_64 -#define USE_SWS_FOR_COLOR_SPACE_CONVERSION 1 -#else -#define USE_SWS_FOR_COLOR_SPACE_CONVERSION 0 -// NOTE: David's color space conversion is much faster than the FFmpeg -// version. Perhaps the SWS code can be used for unsupported conversions? -// Otherwise the alternative code could simply be removed from this file. -#endif #if LIBAVCODEC_VERSION_INT > ((54 << 16) | (50 << 8)) typedef AVCodecID CodecID; diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h index 1ccf494534..ee2b4eb901 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h @@ -20,6 +20,7 @@ extern "C" { #include "avcodec.h" #include "swresample.h" + #include "swscale.h" } @@ -30,6 +31,16 @@ extern "C" { #include "gfx_util.h" +#ifdef __x86_64 +#define USE_SWS_FOR_COLOR_SPACE_CONVERSION 1 +#else +#define USE_SWS_FOR_COLOR_SPACE_CONVERSION 0 +// NOTE: David's color space conversion is much faster than the FFmpeg +// version. Perhaps the SWS code can be used for unsupported conversions? +// Otherwise the alternative code could simply be removed from this file. +#endif + + class AVCodecDecoder : public Decoder { public: AVCodecDecoder();