Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: fix x86_64 build.

Browse Source
This commit is contained in:
Jérôme Duval 2015-11-21 12:01:01 +01:00
parent 4217c52a3b
commit 946163e318
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
View File

@ -50,14 +50,6 @@
static int sDumpedPackets = 0; static int sDumpedPackets = 0;
#endif #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)) #if LIBAVCODEC_VERSION_INT > ((54 << 16) | (50 << 8))
typedef AVCodecID CodecID; typedef AVCodecID CodecID;

11
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
View File

@ -20,6 +20,7 @@
extern "C" { extern "C" {
#include "avcodec.h" #include "avcodec.h"
#include "swresample.h" #include "swresample.h"
#include "swscale.h"
} }
@ -30,6 +31,16 @@ extern "C" {
#include "gfx_util.h" #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 { class AVCodecDecoder : public Decoder {
public: public:
AVCodecDecoder(); AVCodecDecoder();