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 All 40 Lines | |||||
.../ffmpeg/ffmpeg58/include/libavutil/samplefmt.h | 272 + | .../ffmpeg/ffmpeg58/include/libavutil/samplefmt.h | 272 + | ||||
.../ffmpeg/ffmpeg58/include/libavutil/version.h | 139 + | .../ffmpeg/ffmpeg58/include/libavutil/version.h | 139 + | ||||
dom/media/platforms/ffmpeg/ffmpeg58/moz.build | 25 + | dom/media/platforms/ffmpeg/ffmpeg58/moz.build | 25 + | ||||
dom/media/platforms/ffmpeg/moz.build | 1 + | dom/media/platforms/ffmpeg/moz.build | 1 + | ||||
33 files changed, 13355 insertions(+), 6 deletions(-) | 33 files changed, 13355 insertions(+), 6 deletions(-) | ||||
diff --git dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp | diff --git dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp | ||||
index 4600ad6d247c..a9c7089fa880 100644 | index 4600ad6d247c..a9c7089fa880 100644 | ||||
--- mozilla/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp | --- dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp | ||||
+++ mozilla/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp | +++ dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp | ||||
@@ -77,15 +77,21 @@ FFmpegDataDecoder<LIBAV_VER>::InitDecoder() | @@ -77,15 +77,21 @@ FFmpegDataDecoder<LIBAV_VER>::InitDecoder() | ||||
mCodecContext->extradata_size = mExtraData->Length(); | mCodecContext->extradata_size = mExtraData->Length(); | ||||
// FFmpeg may use SIMD instructions to access the data which reads the | // FFmpeg may use SIMD instructions to access the data which reads the | ||||
// data in 32 bytes block. Must ensure we have enough data to read. | // data in 32 bytes block. Must ensure we have enough data to read. | ||||
+#if LIBAVCODEC_VERSION_MAJOR >= 58 | +#if LIBAVCODEC_VERSION_MAJOR >= 58 | ||||
+ mExtraData->AppendElements(AV_INPUT_BUFFER_PADDING_SIZE); | + mExtraData->AppendElements(AV_INPUT_BUFFER_PADDING_SIZE); | ||||
+#else | +#else | ||||
mExtraData->AppendElements(FF_INPUT_BUFFER_PADDING_SIZE); | mExtraData->AppendElements(FF_INPUT_BUFFER_PADDING_SIZE); | ||||
+#endif | +#endif | ||||
mCodecContext->extradata = mExtraData->Elements(); | mCodecContext->extradata = mExtraData->Elements(); | ||||
} else { | } else { | ||||
mCodecContext->extradata_size = 0; | mCodecContext->extradata_size = 0; | ||||
} | } | ||||
+#if LIBAVCODEC_VERSION_MAJOR < 57 | +#if LIBAVCODEC_VERSION_MAJOR < 57 | ||||
if (codec->capabilities & CODEC_CAP_DR1) { | if (codec->capabilities & CODEC_CAP_DR1) { | ||||
mCodecContext->flags |= CODEC_FLAG_EMU_EDGE; | mCodecContext->flags |= CODEC_FLAG_EMU_EDGE; | ||||
} | } | ||||
+#endif | +#endif | ||||
if (mLib->avcodec_open2(mCodecContext, codec, nullptr) < 0) { | if (mLib->avcodec_open2(mCodecContext, codec, nullptr) < 0) { | ||||
mLib->avcodec_close(mCodecContext); | mLib->avcodec_close(mCodecContext); | ||||
diff --git dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp | diff --git dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp | ||||
index 6b8b38487d56..d08eee3fc8e8 100644 | index 6b8b38487d56..d08eee3fc8e8 100644 | ||||
--- mozilla/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp | --- dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp | ||||
+++ mozilla/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp | +++ dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp | ||||
@@ -63,12 +63,14 @@ FFmpegLibWrapper::Link() | @@ -63,12 +63,14 @@ FFmpegLibWrapper::Link() | ||||
AV_FUNC_55 = 1 << 2, | AV_FUNC_55 = 1 << 2, | ||||
AV_FUNC_56 = 1 << 3, | AV_FUNC_56 = 1 << 3, | ||||
AV_FUNC_57 = 1 << 4, | AV_FUNC_57 = 1 << 4, | ||||
+ AV_FUNC_58 = 1 << 5, | + AV_FUNC_58 = 1 << 5, | ||||
AV_FUNC_AVUTIL_53 = AV_FUNC_53 | AV_FUNC_AVUTIL_MASK, | AV_FUNC_AVUTIL_53 = AV_FUNC_53 | AV_FUNC_AVUTIL_MASK, | ||||
AV_FUNC_AVUTIL_54 = AV_FUNC_54 | AV_FUNC_AVUTIL_MASK, | AV_FUNC_AVUTIL_54 = AV_FUNC_54 | AV_FUNC_AVUTIL_MASK, | ||||
AV_FUNC_AVUTIL_55 = AV_FUNC_55 | AV_FUNC_AVUTIL_MASK, | AV_FUNC_AVUTIL_55 = AV_FUNC_55 | AV_FUNC_AVUTIL_MASK, | ||||
Show All 23 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 | |||||
--- dom/media/platforms/ffmpeg/FFmpegLibs.h | |||||
+++ 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 | --- dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | ||||
+++ mozilla/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | +++ 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) | ||||
+ "libavcodec.58.dylib", | + "libavcodec.58.dylib", | ||||
"libavcodec.57.dylib", | "libavcodec.57.dylib", | ||||
"libavcodec.56.dylib", | "libavcodec.56.dylib", | ||||
"libavcodec.55.dylib", | "libavcodec.55.dylib", | ||||
"libavcodec.54.dylib", | "libavcodec.54.dylib", | ||||
"libavcodec.53.dylib", | "libavcodec.53.dylib", | ||||
#else | #else | ||||
+ "libavcodec.so.58", | + "libavcodec.so.58", | ||||
+ "libavcodec-ffmpeg.so.58", | + "libavcodec-ffmpeg.so.58", | ||||
"libavcodec-ffmpeg.so.57", | "libavcodec-ffmpeg.so.57", | ||||
"libavcodec-ffmpeg.so.56", | "libavcodec-ffmpeg.so.56", | ||||
"libavcodec.so.57", | "libavcodec.so.57", | ||||
@@ -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 | |||||
--- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | |||||
+++ 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 | +++ 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 | ||||
+ | + | ||||
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc. | + Copyright (C) 1991, 1999 Free Software Foundation, Inc. | ||||
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
+ Everyone is permitted to copy and distribute verbatim copies | + Everyone is permitted to copy and distribute verbatim copies | ||||
+ of this license document, but changing it is not allowed. | + of this license document, but changing it is not allowed. | ||||
▲ Show 20 Lines • Show All 493 Lines • ▼ Show 20 Lines | |||||
+ | + | ||||
+That's all there is to it! | +That's all there is to it! | ||||
+ | + | ||||
+ | + | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..fb0c6fae70b3 | index 000000000000..fb0c6fae70b3 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h | ||||
@@ -0,0 +1,6146 @@ | @@ -0,0 +1,6146 @@ | ||||
+/* | +/* | ||||
+ * copyright (c) 2001 Fabrice Bellard | + * copyright (c) 2001 Fabrice Bellard | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 6,135 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVCODEC_AVCODEC_H */ | +#endif /* AVCODEC_AVCODEC_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..0c0f9b8d8dae | index 000000000000..0c0f9b8d8dae | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h | ||||
@@ -0,0 +1,118 @@ | @@ -0,0 +1,118 @@ | ||||
+/* | +/* | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
+ * License as published by the Free Software Foundation; either | + * License as published by the Free Software Foundation; either | ||||
+ * version 2.1 of the License, or (at your option) any later version. | + * version 2.1 of the License, or (at your option) any later version. | ||||
▲ Show 20 Lines • Show All 107 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVCODEC_AVFFT_H */ | +#endif /* AVCODEC_AVFFT_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..2cf7da5889ab | index 000000000000..2cf7da5889ab | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h | ||||
@@ -0,0 +1,86 @@ | @@ -0,0 +1,86 @@ | ||||
+/* | +/* | ||||
+ * Video Acceleration API (shared data between FFmpeg and the video player) | + * Video Acceleration API (shared data between FFmpeg and the video player) | ||||
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1 | + * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1 | ||||
+ * | + * | ||||
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems | + * Copyright (C) 2008-2009 Splitted-Desktop Systems | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
▲ Show 20 Lines • Show All 75 Lines • ▼ Show 20 Lines | |||||
+ | + | ||||
+#endif /* FF_API_STRUCT_VAAPI_CONTEXT */ | +#endif /* FF_API_STRUCT_VAAPI_CONTEXT */ | ||||
+ | + | ||||
+#endif /* AVCODEC_VAAPI_H */ | +#endif /* AVCODEC_VAAPI_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..4d9994336911 | index 000000000000..4d9994336911 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h | ||||
@@ -0,0 +1,176 @@ | @@ -0,0 +1,176 @@ | ||||
+/* | +/* | ||||
+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for | + * The Video Decode and Presentation API for UNIX (VDPAU) is used for | ||||
+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1. | + * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1. | ||||
+ * | + * | ||||
+ * Copyright (C) 2008 NVIDIA | + * Copyright (C) 2008 NVIDIA | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
▲ Show 20 Lines • Show All 165 Lines • ▼ Show 20 Lines | |||||
+ | + | ||||
+/* @}*/ | +/* @}*/ | ||||
+ | + | ||||
+#endif /* AVCODEC_VDPAU_H */ | +#endif /* AVCODEC_VDPAU_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..6895f1a461e3 | index 000000000000..6895f1a461e3 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h | ||||
@@ -0,0 +1,137 @@ | @@ -0,0 +1,137 @@ | ||||
+/* | +/* | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
+ * License as published by the Free Software Foundation; either | + * License as published by the Free Software Foundation; either | ||||
+ * version 2.1 of the License, or (at your option) any later version. | + * version 2.1 of the License, or (at your option) any later version. | ||||
▲ Show 20 Lines • Show All 126 Lines • ▼ Show 20 Lines | |||||
+#endif | +#endif | ||||
+ | + | ||||
+ | + | ||||
+#endif /* AVCODEC_VERSION_H */ | +#endif /* AVCODEC_VERSION_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..ced108aa2c75 | index 000000000000..ced108aa2c75 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h | ||||
@@ -0,0 +1,167 @@ | @@ -0,0 +1,167 @@ | ||||
+/* | +/* | ||||
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 156 Lines • ▼ Show 20 Lines | |||||
+# define av_noreturn | +# define av_noreturn | ||||
+#endif | +#endif | ||||
+ | + | ||||
+#endif /* AVUTIL_ATTRIBUTES_H */ | +#endif /* AVUTIL_ATTRIBUTES_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..c289fbb551c1 | index 000000000000..c289fbb551c1 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h | ||||
@@ -0,0 +1,6 @@ | @@ -0,0 +1,6 @@ | ||||
+/* Generated by ffmpeg configure */ | +/* Generated by ffmpeg configure */ | ||||
+#ifndef AVUTIL_AVCONFIG_H | +#ifndef AVUTIL_AVCONFIG_H | ||||
+#define AVUTIL_AVCONFIG_H | +#define AVUTIL_AVCONFIG_H | ||||
+#define AV_HAVE_BIGENDIAN 0 | +#define AV_HAVE_BIGENDIAN 0 | ||||
+#define AV_HAVE_FAST_UNALIGNED 1 | +#define AV_HAVE_FAST_UNALIGNED 1 | ||||
+#endif /* AVUTIL_AVCONFIG_H */ | +#endif /* AVUTIL_AVCONFIG_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..4d633156d14d | index 000000000000..4d633156d14d | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h | ||||
@@ -0,0 +1,365 @@ | @@ -0,0 +1,365 @@ | ||||
+/* | +/* | ||||
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 354 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_AVUTIL_H */ | +#endif /* AVUTIL_AVUTIL_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..73b6bd0b148e | index 000000000000..73b6bd0b148e | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h | ||||
@@ -0,0 +1,291 @@ | @@ -0,0 +1,291 @@ | ||||
+/* | +/* | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
+ * License as published by the Free Software Foundation; either | + * License as published by the Free Software Foundation; either | ||||
+ * version 2.1 of the License, or (at your option) any later version. | + * version 2.1 of the License, or (at your option) any later version. | ||||
▲ Show 20 Lines • Show All 280 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_BUFFER_H */ | +#endif /* AVUTIL_BUFFER_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..50bb8f03c586 | index 000000000000..50bb8f03c586 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h | ||||
@@ -0,0 +1,232 @@ | @@ -0,0 +1,232 @@ | ||||
+/* | +/* | ||||
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | + * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | ||||
+ * Copyright (c) 2008 Peter Ross | + * Copyright (c) 2008 Peter Ross | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
▲ Show 20 Lines • Show All 221 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_CHANNEL_LAYOUT_H */ | +#endif /* AVUTIL_CHANNEL_LAYOUT_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..0fffa67714e8 | index 000000000000..0fffa67714e8 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h | ||||
@@ -0,0 +1,560 @@ | @@ -0,0 +1,560 @@ | ||||
+/* | +/* | ||||
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 549 Lines • ▼ Show 20 Lines | |||||
+#endif | +#endif | ||||
+#ifndef av_parity | +#ifndef av_parity | ||||
+# define av_parity av_parity_c | +# define av_parity av_parity_c | ||||
+#endif | +#endif | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..8bb9eb606bf2 | index 000000000000..8bb9eb606bf2 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h | ||||
@@ -0,0 +1,130 @@ | @@ -0,0 +1,130 @@ | ||||
+/* | +/* | ||||
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard | + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Lines | |||||
+ */ | + */ | ||||
+size_t av_cpu_max_align(void); | +size_t av_cpu_max_align(void); | ||||
+ | + | ||||
+#endif /* AVUTIL_CPU_H */ | +#endif /* AVUTIL_CPU_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..118f1f00ed20 | index 000000000000..118f1f00ed20 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h | ||||
@@ -0,0 +1,200 @@ | @@ -0,0 +1,200 @@ | ||||
+/* | +/* | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
+ * License as published by the Free Software Foundation; either | + * License as published by the Free Software Foundation; either | ||||
+ * version 2.1 of the License, or (at your option) any later version. | + * version 2.1 of the License, or (at your option) any later version. | ||||
▲ Show 20 Lines • Show All 189 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_DICT_H */ | +#endif /* AVUTIL_DICT_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..71df4da353b9 | index 000000000000..71df4da353b9 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h | ||||
@@ -0,0 +1,126 @@ | @@ -0,0 +1,126 @@ | ||||
+/* | +/* | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
+ * License as published by the Free Software Foundation; either | + * License as published by the Free Software Foundation; either | ||||
+ * version 2.1 of the License, or (at your option) any later version. | + * version 2.1 of the License, or (at your option) any later version. | ||||
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_ERROR_H */ | +#endif /* AVUTIL_ERROR_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..9d57d6ce66ff | index 000000000000..9d57d6ce66ff | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h | ||||
@@ -0,0 +1,893 @@ | @@ -0,0 +1,893 @@ | ||||
+/* | +/* | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
+ * License as published by the Free Software Foundation; either | + * License as published by the Free Software Foundation; either | ||||
+ * version 2.1 of the License, or (at your option) any later version. | + * version 2.1 of the License, or (at your option) any later version. | ||||
▲ Show 20 Lines • Show All 882 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_FRAME_H */ | +#endif /* AVUTIL_FRAME_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..f5a4b6238774 | index 000000000000..f5a4b6238774 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h | ||||
@@ -0,0 +1,584 @@ | @@ -0,0 +1,584 @@ | ||||
+/* | +/* | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
+ * License as published by the Free Software Foundation; either | + * License as published by the Free Software Foundation; either | ||||
+ * version 2.1 of the License, or (at your option) any later version. | + * version 2.1 of the License, or (at your option) any later version. | ||||
▲ Show 20 Lines • Show All 573 Lines • ▼ Show 20 Lines | |||||
+ AVBufferRef *source_frame_ctx, | + AVBufferRef *source_frame_ctx, | ||||
+ int flags); | + int flags); | ||||
+ | + | ||||
+#endif /* AVUTIL_HWCONTEXT_H */ | +#endif /* AVUTIL_HWCONTEXT_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..fe3d7ec4a5b6 | index 000000000000..fe3d7ec4a5b6 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h | ||||
@@ -0,0 +1,77 @@ | @@ -0,0 +1,77 @@ | ||||
+/* | +/* | ||||
+ * Copyright (c) 2011 Mans Rullgard | + * Copyright (c) 2011 Mans Rullgard | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 66 Lines • ▼ Show 20 Lines | |||||
+ return v.i; | + return v.i; | ||||
+} | +} | ||||
+ | + | ||||
+#endif /* AVUTIL_INTFLOAT_H */ | +#endif /* AVUTIL_INTFLOAT_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..d9554e609d40 | index 000000000000..d9554e609d40 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h | ||||
@@ -0,0 +1,362 @@ | @@ -0,0 +1,362 @@ | ||||
+/* | +/* | ||||
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 351 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_LOG_H */ | +#endif /* AVUTIL_LOG_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..2007ee561987 | index 000000000000..2007ee561987 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h | ||||
@@ -0,0 +1,50 @@ | @@ -0,0 +1,50 @@ | ||||
+/* | +/* | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
+ * License as published by the Free Software Foundation; either | + * License as published by the Free Software Foundation; either | ||||
+ * version 2.1 of the License, or (at your option) any later version. | + * version 2.1 of the License, or (at your option) any later version. | ||||
Show All 39 Lines | |||||
+ | + | ||||
+#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) | +#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) | ||||
+ | + | ||||
+#endif /* AVUTIL_MACROS_H */ | +#endif /* AVUTIL_MACROS_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..54901800ba6a | index 000000000000..54901800ba6a | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h | ||||
@@ -0,0 +1,242 @@ | @@ -0,0 +1,242 @@ | ||||
+/* | +/* | ||||
+ * copyright (c) 2005-2012 Michael Niedermayer <michaelni@gmx.at> | + * copyright (c) 2005-2012 Michael Niedermayer <michaelni@gmx.at> | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 231 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_MATHEMATICS_H */ | +#endif /* AVUTIL_MATHEMATICS_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..7e0b12a8a782 | index 000000000000..7e0b12a8a782 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h | ||||
@@ -0,0 +1,700 @@ | @@ -0,0 +1,700 @@ | ||||
+/* | +/* | ||||
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 689 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_MEM_H */ | +#endif /* AVUTIL_MEM_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..e184a56672dc | index 000000000000..e184a56672dc | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h | ||||
@@ -0,0 +1,529 @@ | @@ -0,0 +1,529 @@ | ||||
+/* | +/* | ||||
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 518 Lines • ▼ Show 20 Lines | |||||
+ AVCHROMA_LOC_NB ///< Not part of ABI | + AVCHROMA_LOC_NB ///< Not part of ABI | ||||
+}; | +}; | ||||
+ | + | ||||
+#endif /* AVUTIL_PIXFMT_H */ | +#endif /* AVUTIL_PIXFMT_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..5c6b67b4e9f8 | index 000000000000..5c6b67b4e9f8 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h | ||||
@@ -0,0 +1,214 @@ | @@ -0,0 +1,214 @@ | ||||
+/* | +/* | ||||
+ * rational numbers | + * rational numbers | ||||
+ * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> | + * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
▲ Show 20 Lines • Show All 203 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_RATIONAL_H */ | +#endif /* AVUTIL_RATIONAL_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..8cd43ae8568a | index 000000000000..8cd43ae8568a | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h | ||||
@@ -0,0 +1,272 @@ | @@ -0,0 +1,272 @@ | ||||
+/* | +/* | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
+ * License as published by the Free Software Foundation; either | + * License as published by the Free Software Foundation; either | ||||
+ * version 2.1 of the License, or (at your option) any later version. | + * version 2.1 of the License, or (at your option) any later version. | ||||
▲ Show 20 Lines • Show All 261 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+#endif /* AVUTIL_SAMPLEFMT_H */ | +#endif /* AVUTIL_SAMPLEFMT_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h | diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..3a63e6355f84 | index 000000000000..3a63e6355f84 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h | +++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h | ||||
@@ -0,0 +1,139 @@ | @@ -0,0 +1,139 @@ | ||||
+/* | +/* | ||||
+ * copyright (c) 2003 Fabrice Bellard | + * copyright (c) 2003 Fabrice Bellard | ||||
+ * | + * | ||||
+ * This file is part of FFmpeg. | + * This file is part of FFmpeg. | ||||
+ * | + * | ||||
+ * FFmpeg is free software; you can redistribute it and/or | + * FFmpeg is free software; you can redistribute it and/or | ||||
+ * modify it under the terms of the GNU Lesser General Public | + * modify it under the terms of the GNU Lesser General Public | ||||
▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Lines | |||||
+ * @} | + * @} | ||||
+ */ | + */ | ||||
+ | + | ||||
+#endif /* AVUTIL_VERSION_H */ | +#endif /* AVUTIL_VERSION_H */ | ||||
diff --git dom/media/platforms/ffmpeg/ffmpeg58/moz.build dom/media/platforms/ffmpeg/ffmpeg58/moz.build | diff --git dom/media/platforms/ffmpeg/ffmpeg58/moz.build dom/media/platforms/ffmpeg/ffmpeg58/moz.build | ||||
new file mode 100644 | new file mode 100644 | ||||
index 000000000000..c757ed6fad04 | index 000000000000..c757ed6fad04 | ||||
--- /dev/null | --- /dev/null | ||||
+++ mozilla/dom/media/platforms/ffmpeg/ffmpeg58/moz.build | +++ dom/media/platforms/ffmpeg/ffmpeg58/moz.build | ||||
@@ -0,0 +1,25 @@ | @@ -0,0 +1,25 @@ | ||||
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- | +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- | ||||
+# vim: set filetype=python: | +# vim: set filetype=python: | ||||
+# This Source Code Form is subject to the terms of the Mozilla Public | +# This Source Code Form is subject to the terms of the Mozilla Public | ||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this | +# License, v. 2.0. If a copy of the MPL was not distributed with this | ||||
+# file, You can obtain one at http://mozilla.org/MPL/2.0/. | +# file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||||
+ | + | ||||
+UNIFIED_SOURCES += [ | +UNIFIED_SOURCES += [ | ||||
Show All 12 Lines | |||||
+if CONFIG['CC_TYPE'] == 'clang': | +if CONFIG['CC_TYPE'] == 'clang': | ||||
+ CXXFLAGS += [ | + CXXFLAGS += [ | ||||
+ '-Wno-unknown-attributes', | + '-Wno-unknown-attributes', | ||||
+ ] | + ] | ||||
+ | + | ||||
+FINAL_LIBRARY = 'xul' | +FINAL_LIBRARY = 'xul' | ||||
diff --git dom/media/platforms/ffmpeg/moz.build dom/media/platforms/ffmpeg/moz.build | diff --git dom/media/platforms/ffmpeg/moz.build dom/media/platforms/ffmpeg/moz.build | ||||
index 604e445aa4d9..af96fb521e3d 100644 | index 604e445aa4d9..af96fb521e3d 100644 | ||||
--- mozilla/dom/media/platforms/ffmpeg/moz.build | --- dom/media/platforms/ffmpeg/moz.build | ||||
+++ mozilla/dom/media/platforms/ffmpeg/moz.build | +++ dom/media/platforms/ffmpeg/moz.build | ||||
@@ -13,6 +13,7 @@ DIRS += [ | @@ -13,6 +13,7 @@ DIRS += [ | ||||
'libav54', | 'libav54', | ||||
'libav55', | 'libav55', | ||||
'ffmpeg57', | 'ffmpeg57', | ||||
+ 'ffmpeg58', | + 'ffmpeg58', | ||||
] | ] | ||||
UNIFIED_SOURCES += [ | UNIFIED_SOURCES += [ |