Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,39 @@
path = third-party/FFmpeg/AMF
url = https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git
branch = master
shallow = true
shallow = true
[submodule "third-party/FFmpeg/x264"]
path = third-party/FFmpeg/x264
url = https://github.com/LizardByte-infrastructure/x264.git
branch = master
shallow = true
shallow = true
[submodule "third-party/FFmpeg/x265_git"]
path = third-party/FFmpeg/x265_git
url = https://github.com/LizardByte-infrastructure/x265_git.git
branch = stable
shallow = true
shallow = true
[submodule "third-party/FFmpeg/nv-codec-headers"]
path = third-party/FFmpeg/nv-codec-headers
url = https://github.com/FFmpeg/nv-codec-headers.git
branch = sdk/12.0
shallow = true
branch = master
shallow = true
[submodule "third-party/FFmpeg/FFmpeg"]
path = third-party/FFmpeg/FFmpeg
url = https://github.com/FFmpeg/FFmpeg.git
branch = release/8.0
shallow = true
shallow = true
[submodule "third-party/FFmpeg/SVT-AV1"]
path = third-party/FFmpeg/SVT-AV1
url = https://github.com/LizardByte-infrastructure/SVT-AV1.git
branch = master
shallow = true
shallow = true
[submodule "third-party/FFmpeg/Vulkan-Headers"]
path = third-party/FFmpeg/Vulkan-Headers
url = https://github.com/KhronosGroup/Vulkan-Headers.git
branch = main
shallow = true
shallow = true
[submodule "third-party/FFmpeg/Vulkan-Loader"]
path = third-party/FFmpeg/Vulkan-Loader
url = https://github.com/KhronosGroup/Vulkan-Loader.git
branch = main
shallow = true
shallow = true
35 changes: 0 additions & 35 deletions patches/FFmpeg/FFmpeg/AMF/01-amf-outputdelay.patch

This file was deleted.

28 changes: 0 additions & 28 deletions patches/FFmpeg/FFmpeg/MF/01-mfenc-lowlatency.patch

This file was deleted.

10 changes: 5 additions & 5 deletions patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Explicitly imports intmath as our subset of sources doesn't have it included

diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index 458381f038..c4a6561706 100644
index d05352c738..5e73ff2deb 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -17,6 +17,7 @@
*/
@@ -18,6 +18,7 @@

Check failure on line 8 in patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch:8: Trailing whitespace at end of line.

Check failure on line 8 in patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch:8: Trailing whitespace at end of line.
#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
+#include "libavutil/intmath.h"
#include "libavutil/opt.h"
#include "libavutil/pixfmt.h"

Check failure on line 14 in patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch:14: Trailing whitespace at end of line.

Check failure on line 14 in patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch:14: Trailing whitespace at end of line.
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 2de74691cb..e3a5e5b5df 100644
index bcf6144046..76698247cd 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -19,6 +19,7 @@
Expand All @@ -21,17 +21,17 @@
#include "libavutil/avassert.h"
#include "libavutil/mem.h"
+#include "libavutil/intmath.h"

Check failure on line 24 in patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch:24: Trailing whitespace at end of line.

Check failure on line 24 in patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch:24: Trailing whitespace at end of line.
#include "bytestream.h"
#include "cbs.h"
diff --git a/libavcodec/cbs_sei_syntax_template.c b/libavcodec/cbs_sei_syntax_template.c
index 0205bb47aa..7d4d0fd14d 100644
index 4fc3061728..ccc8e6d34c 100644
--- a/libavcodec/cbs_sei_syntax_template.c
+++ b/libavcodec/cbs_sei_syntax_template.c
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

Check failure on line 34 in patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch:34: Trailing whitespace at end of line.

Check failure on line 34 in patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/01-explicit-intmath.patch:34: Trailing whitespace at end of line.
+#include "libavutil/intmath.h"
+
SEI_FUNC(filler_payload, (CodedBitstreamContext *ctx, RWContext *rw,
Expand Down
14 changes: 7 additions & 7 deletions patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Register storage specifier is an error for modern compiler and generally ignored anyway.

diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index fe2f6378b4..477bd11746 100644
index a22c9755ae..354adb64c8 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -291,8 +291,8 @@ static inline void skip_bits_long(GetBitContext *s, int n)
@@ -293,8 +293,8 @@ static inline void skip_bits_long(GetBitContext *s, int n)
*/
static inline int get_xbits(GetBitContext *s, int n)
{
Expand All @@ -15,8 +15,8 @@
OPEN_READER(re, s);
av_assert2(n>0 && n<=25);
UPDATE_CACHE(re, s);
@@ -305,8 +305,8 @@ static inline int get_xbits(GetBitContext *s, int n)
@@ -307,8 +307,8 @@ static inline int get_xbits(GetBitContext *s, int n)

Check failure on line 19 in patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch:19: Trailing whitespace at end of line.

Check failure on line 19 in patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch:19: Trailing whitespace at end of line.
static inline int get_xbits_le(GetBitContext *s, int n)
{
- register int sign;
Expand All @@ -26,8 +26,8 @@
OPEN_READER(re, s);
av_assert2(n>0 && n<=25);
UPDATE_CACHE_LE(re, s);
@@ -319,7 +319,7 @@ static inline int get_xbits_le(GetBitContext *s, int n)
@@ -321,7 +321,7 @@ static inline int get_xbits_le(GetBitContext *s, int n)

Check failure on line 30 in patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch:30: Trailing whitespace at end of line.

Check failure on line 30 in patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch:30: Trailing whitespace at end of line.
static inline int get_sbits(GetBitContext *s, int n)
{
- register int tmp;
Expand All @@ -35,7 +35,7 @@
OPEN_READER(re, s);
av_assert2(n>0 && n<=25);
UPDATE_CACHE(re, s);
@@ -334,7 +334,7 @@ static inline int get_sbits(GetBitContext *s, int n)
@@ -336,7 +336,7 @@ static inline int get_sbits(GetBitContext *s, int n)
*/
static inline unsigned int get_bits(GetBitContext *s, int n)
{
Expand All @@ -44,8 +44,8 @@
OPEN_READER(re, s);
av_assert2(n>0 && n<=25);
UPDATE_CACHE(re, s);
@@ -355,7 +355,7 @@ static av_always_inline int get_bitsz(GetBitContext *s, int n)
@@ -357,7 +357,7 @@ static av_always_inline int get_bitsz(GetBitContext *s, int n)

Check failure on line 48 in patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch:48: Trailing whitespace at end of line.

Check failure on line 48 in patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

Trailing Whitespace

patches/FFmpeg/FFmpeg/cbs/02-remove-register.patch:48: Trailing whitespace at end of line.
static inline unsigned int get_bits_le(GetBitContext *s, int n)
{
- register int tmp;
Expand All @@ -53,7 +53,7 @@
OPEN_READER(re, s);
av_assert2(n>0 && n<=25);
UPDATE_CACHE_LE(re, s);
@@ -370,7 +370,7 @@ static inline unsigned int get_bits_le(GetBitContext *s, int n)
@@ -372,7 +372,7 @@ static inline unsigned int get_bits_le(GetBitContext *s, int n)
*/
static inline unsigned int show_bits(GetBitContext *s, int n)
{
Expand Down
68 changes: 0 additions & 68 deletions patches/FFmpeg/FFmpeg/cbs/03-size-specifier.patch

This file was deleted.

2 changes: 1 addition & 1 deletion third-party/FFmpeg/FFmpeg
Submodule FFmpeg updated 1954 files
Loading