build(deps): bump ffmpeg_sources/ffmpeg from 63f5c00 to 87ccf99 (#…

…367) * build(deps): bump ffmpeg_sources/ffmpeg from `63f5c00` to `87ccf99` Bumps [ffmpeg_sources/ffmpeg](https://github.com/FFmpeg/FFmpeg) from `63f5c00` to `87ccf99`. - [Commits](FFmpeg/FFmpeg@63f5c00...87ccf99) --- updated-dependencies: - dependency-name: ffmpeg_sources/ffmpeg dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Revert "fix(ffmpeg): revert broken commit from FFmpeg 7.1 (#365)" Fixed by 020d9f2b4886aa620252da4db7a4936378d6eb3a upstream. This reverts commit 1735298. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cameron Gutman <[email protected]>
LizardByte · Oct 15, 2024 · 404b9a7 · 404b9a7
1 parent 1735298
commit 404b9a7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 52 deletions.
diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml
@@ -311,7 +311,6 @@ jobs:
           git apply -v --ignore-whitespace ../../ffmpeg_patches/ffmpeg/04-mfenc-lowlatency.patch
           git apply -v --ignore-whitespace ../../ffmpeg_patches/ffmpeg/05-vaapi-customized-surface-alignment.patch
           git apply -v --ignore-whitespace ../../ffmpeg_patches/ffmpeg/06-amfenc-query-timeout.patch
-          git apply -v --ignore-whitespace ../../ffmpeg_patches/ffmpeg/07-avcodec-options-revert.patch
 
       - name: Setup cross compilation
         id: cross

diff --git a/ffmpeg_patches/ffmpeg/07-avcodec-options-revert.patch b/ffmpeg_patches/ffmpeg/07-avcodec-options-revert.patch
diff --git a/ffmpeg_sources/ffmpeg b/ffmpeg_sources/ffmpeg
+12 −9		fftools/ffmpeg_filter.c
+13 −4		libavcodec/avcodec.c
+3 −0		libavcodec/vaapi_encode_h264.c
+0 −1		libavcodec/x86/celt_pvq_search.asm
+11 −12		libavfilter/framesync.c
+4 −4		libswresample/arm/resample.S
+1 −2		libswscale/arm/hscale.S
+1 −2		libswscale/arm/output.S
+1 −2		libswscale/arm/yuv2rgb_neon.S
+9 −5		tests/checkasm/lls.c