From 942f47c9941c54393ffa6749b26569b1e163197c Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 29 Dec 2019 09:52:58 -0600 Subject: user/ffmpeg: Forward-port patch to 4.2.1 --- user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch | 2 +- user/ffmpeg/APKBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch index 93e3ac995..9cc6fdfcf 100644 --- a/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch +++ b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch @@ -15,7 +15,7 @@ diff --git a/libavutil/internal.h b/libavutil/internal.h index 61784b5..69d63d5 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h -@@ -177,34 +177,6 @@ +@@ -187,34 +187,6 @@ #endif /** diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index 06d9db55c..48b70752c 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -98,4 +98,4 @@ libs() { } sha512sums="3efddc7d6bbccba9a1f55bf0e6caa8a578405a7e12058ce526766ed5eca9d45a783dbf86325ab860a8eabbe29701f8093e691f0138e0d9cc883cfe5200b3561b ffmpeg-4.2.1.tar.xz -32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" +1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" -- cgit v1.2.3-60-g2f50