From 68acfbb14b48a988e68e056a1d3376cef0f6fba6 Mon Sep 17 00:00:00 2001
From: trav90 <travawine@palemoon.org>
Date: Fri, 28 Dec 2018 19:49:47 -0600
Subject: [FFmpeg] Don't define AV_CODEC_ID_VPx with libavcodec 58

---
 dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'dom/media')

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;
-- 
cgit v1.2.3