Changeset View
Changeset View
Standalone View
Standalone View
mail/thunderbird/files/patch-bug1435212
- This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 107 Lines • ▼ Show 20 Lines | |||||
- AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57)) | - AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57)) | ||||
- AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57)) | - AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57)) | ||||
+ AV_FUNC(av_frame_alloc, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) | + AV_FUNC(av_frame_alloc, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) | ||||
+ AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) | + AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) | ||||
+ AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) | + AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) | ||||
AV_FUNC_OPTION(av_frame_get_colorspace, AV_FUNC_AVUTIL_ALL) | AV_FUNC_OPTION(av_frame_get_colorspace, AV_FUNC_AVUTIL_ALL) | ||||
#undef AV_FUNC | #undef AV_FUNC | ||||
#undef AV_FUNC_OPTION | #undef AV_FUNC_OPTION | ||||
diff --git dom/media/platforms/ffmpeg/FFmpegLibs.h dom/media/platforms/ffmpeg/FFmpegLibs.h | |||||
index b8c092330212..be99eaa244ca 100644 | |||||
--- mozilla/dom/media/platforms/ffmpeg/FFmpegLibs.h | |||||
+++ mozilla/dom/media/platforms/ffmpeg/FFmpegLibs.h | |||||
@@ -27,9 +27,11 @@ extern "C" { | |||||
#define AV_CODEC_ID_VP8 CODEC_ID_VP8 | |||||
#define AV_CODEC_ID_NONE CODEC_ID_NONE | |||||
#define AV_CODEC_ID_FLAC CODEC_ID_FLAC | |||||
-#define AV_CODEC_FLAG_LOW_DELAY CODEC_FLAG_LOW_DELAY | |||||
typedef CodecID AVCodecID; | |||||
#endif | |||||
+#if LIBAVCODEC_VERSION_MAJOR <= 55 | |||||
+#define AV_CODEC_FLAG_LOW_DELAY CODEC_FLAG_LOW_DELAY | |||||
+#endif | |||||
#ifdef FFVPX_VERSION | |||||
enum { LIBAV_VER = FFVPX_VERSION }; | |||||
diff --git dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | diff --git dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | ||||
index f671e6e61bc4..b7ab49329502 100644 | index f671e6e61bc4..b7ab49329502 100644 | ||||
--- mozilla/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | --- mozilla/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | ||||
+++ mozilla/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | +++ mozilla/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | ||||
@@ -26,12 +26,15 @@ static FFmpegLibWrapper sLibAV; | @@ -26,12 +26,15 @@ static FFmpegLibWrapper sLibAV; | ||||
static const char* sLibs[] = { | static const char* sLibs[] = { | ||||
#if defined(XP_DARWIN) | #if defined(XP_DARWIN) | ||||
Show All 12 Lines | |||||
@@ -134,6 +137,7 @@ FFmpegRuntimeLinker::CreateDecoderModule() | @@ -134,6 +137,7 @@ FFmpegRuntimeLinker::CreateDecoderModule() | ||||
case 55: | case 55: | ||||
case 56: module = FFmpegDecoderModule<55>::Create(&sLibAV); break; | case 56: module = FFmpegDecoderModule<55>::Create(&sLibAV); break; | ||||
case 57: module = FFmpegDecoderModule<57>::Create(&sLibAV); break; | case 57: module = FFmpegDecoderModule<57>::Create(&sLibAV); break; | ||||
+ case 58: module = FFmpegDecoderModule<58>::Create(&sLibAV); break; | + case 58: module = FFmpegDecoderModule<58>::Create(&sLibAV); break; | ||||
default: module = nullptr; | default: module = nullptr; | ||||
} | } | ||||
return module.forget(); | return module.forget(); | ||||
diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | |||||
index 184fd43b6573..de37e007488f 100644 | |||||
--- mozilla/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | |||||
+++ mozilla/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | |||||
@@ -166,7 +166,7 @@ FFmpegVideoDecoder<LIBAV_VER>::InitCodecContext() | |||||
} | |||||
if (mLowLatency) { | |||||
- mCodecContext->flags |= CODEC_FLAG_LOW_DELAY; | |||||
+ mCodecContext->flags |= AV_CODEC_FLAG_LOW_DELAY; | |||||
// ffvp9 and ffvp8 at this stage do not support slice threading, but it may | |||||
// help with the h264 decoder if there's ever one. | |||||
mCodecContext->thread_type = FF_THREAD_SLICE; | |||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1 dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1 | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1 dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1 | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..00b4fedfe7e7 | index 000000000000..00b4fedfe7e7 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1 | +++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1 | ||||
@@ -0,0 +1,504 @@ | @@ -0,0 +1,504 @@ | ||||
+ GNU LESSER GENERAL PUBLIC LICENSE | + GNU LESSER GENERAL PUBLIC LICENSE | ||||
+ Version 2.1, February 1999 | + Version 2.1, February 1999 | ||||
▲ Show 20 Lines • Show All 13,497 Lines • Show Last 20 Lines |