wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-26 00:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

[FFmpeg] Don't define AV_CODEC_ID_VPx with libavcodec 58

Browse source
This commit is contained in:
trav90 2018-12-28 19:49:47 -06:00 • committed by Roy Tam
commit 74ccd45360
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
View file

@ -174,12 +174,15 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, bool* aGotFrame)
uint8_t* inputData = const_cast<uint8_t*>(aSample->Data()); uint8_t* inputData = const_cast<uint8_t*>(aSample->Data());
size_t inputSize = aSample->Size(); 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 (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 || mCodecID == AV_CODEC_ID_VP9
#endif #endif
)) { ))
#endif
#if LIBAVCODEC_VERSION_MAJOR >= 54
{
while (inputSize) { while (inputSize) {
uint8_t* data = inputData; uint8_t* data = inputData;
int size = inputSize; int size = inputSize;