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

ffmpeg: check against correct version constants.

Browse Source 
54.23.x is ffmpeg 0.11, which still has "CodecID" (and x>0).
This commit is contained in:
Adrien Destugues 2015-08-30 18:00:08 +02:00
parent f618c89e17
commit 278af8e281
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@
// Otherwise the alternative code could simply be removed from this file.
#endif
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (23 << 8))
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (50 << 8))
typedef AVCodecID CodecID;
#endif

2
src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
View File

@ -17,7 +17,7 @@ extern "C" {
#include "EncoderPlugin.h"
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (23 << 8))
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (50 << 8))
typedef AVCodecID CodecID;
#endif

2
src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
View File

@ -53,7 +53,7 @@ static const size_t kIOBufferSize = 64 * 1024;
#define OPEN_CODEC_CONTEXT 1
#define GET_CONTEXT_DEFAULTS 0
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (23 << 8))
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (50 << 8))
typedef AVCodecID CodecID;
#endif

2
src/add-ons/media/plugins/ffmpeg/CodecTable.cpp
View File

@ -12,7 +12,7 @@ extern "C" {
}
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (23 << 8))
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (50 << 8))
typedef AVCodecID CodecID;
#endif

2
src/add-ons/media/plugins/ffmpeg/EncoderTable.h
View File

@ -13,7 +13,7 @@ extern "C" {
}
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (23 << 8))
#if LIBAVCODEC_VERSION_INT > ((54 << 16) | (50 << 8))
typedef AVCodecID CodecID;
#endif