diff options
| author | trav90 <travawine@palemoon.org> | 2018-12-28 19:49:47 -0600 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-12-28 19:49:47 -0600 |
| commit | 68acfbb14b48a988e68e056a1d3376cef0f6fba6 (patch) | |
| tree | 192791897f7e2ae85f7a4c6b37e5fafdf42e4819 /dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | |
| parent | 515e0794f832e6557c0315e0f397be90fd6395af (diff) | |
| download | UXP-68acfbb14b48a988e68e056a1d3376cef0f6fba6.tar UXP-68acfbb14b48a988e68e056a1d3376cef0f6fba6.tar.gz UXP-68acfbb14b48a988e68e056a1d3376cef0f6fba6.tar.lz UXP-68acfbb14b48a988e68e056a1d3376cef0f6fba6.tar.xz UXP-68acfbb14b48a988e68e056a1d3376cef0f6fba6.zip | |
[FFmpeg] Don't define AV_CODEC_ID_VPx with libavcodec 58
Diffstat (limited to 'dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp')
| -rw-r--r-- | dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp index d71a86b3c..f3101e44c 100644 --- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp @@ -174,12 +174,15 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, bool* aGotFrame) uint8_t* inputData = const_cast<uint8_t*>(aSample->Data()); size_t inputSize = aSample->Size(); -#if LIBAVCODEC_VERSION_MAJOR >= 54 +#if LIBAVCODEC_VERSION_MAJOR >= 54 && LIBAVCODEC_VERSION_MAJOR < 58 if (inputSize && mCodecParser && (mCodecID == AV_CODEC_ID_VP8 -#if LIBAVCODEC_VERSION_MAJOR >= 55 +#if LIBAVCODEC_VERSION_MAJOR >= 55 && LIBAVCODEC_VERSION_MAJOR < 58 || mCodecID == AV_CODEC_ID_VP9 #endif - )) { + )) +#endif +#if LIBAVCODEC_VERSION_MAJOR >= 54 + { while (inputSize) { uint8_t* data = inputData; int size = inputSize; |