qzhao/ffmpeg-4
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-4
Code Pull Requests Activity
12548ef9e3
ffmpeg-4/ffmpeg-arm6l.diff

18 lines
508 B
Diff
Raw Normal View History

Accepting request 620431 from home:scarabeus_iv FFmpeg4 OBS-URL: https://build.opensuse.org/request/show/620431 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=1
2018-07-04 10:12:41 +02:00
---
libavutil/arm/timer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Accepting request 928002 from home:iznogood:branches:multimedia:libs - Update to version 4.4.1: * Stable bug fix release, mainly codecs and format fixes. - Refresh patches with quilt. - Drop patches fixed upstream: * ffmpeg-CVE-2021-33815.patch * ffmpeg-CVE-2021-38114.patch * ffmpeg-CVE-2021-38171.patch * ffmpeg-CVE-2020-22037.patch OBS-URL: https://build.opensuse.org/request/show/928002 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=171
2021-10-28 20:25:04 +02:00
Index: ffmpeg-4.4.1/libavutil/arm/timer.h
Accepting request 620431 from home:scarabeus_iv FFmpeg4 OBS-URL: https://build.opensuse.org/request/show/620431 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=1
2018-07-04 10:12:41 +02:00
===================================================================
Accepting request 928002 from home:iznogood:branches:multimedia:libs - Update to version 4.4.1: * Stable bug fix release, mainly codecs and format fixes. - Refresh patches with quilt. - Drop patches fixed upstream: * ffmpeg-CVE-2021-33815.patch * ffmpeg-CVE-2021-38114.patch * ffmpeg-CVE-2021-38171.patch * ffmpeg-CVE-2020-22037.patch OBS-URL: https://build.opensuse.org/request/show/928002 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=171
2021-10-28 20:25:04 +02:00
--- ffmpeg-4.4.1.orig/libavutil/arm/timer.h
+++ ffmpeg-4.4.1/libavutil/arm/timer.h
- Update to release 4.4 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=155
2021-04-09 22:59:58 +02:00
@@ -30,7 +30,7 @@
Accepting request 620431 from home:scarabeus_iv FFmpeg4 OBS-URL: https://build.opensuse.org/request/show/620431 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=1
2018-07-04 10:12:41 +02:00
- Update to release 4.4 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=155
2021-04-09 22:59:58 +02:00
#define AV_READ_TIME mach_absolute_time
-#elif HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__)
+#elif HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6ZK__)
Accepting request 620431 from home:scarabeus_iv FFmpeg4 OBS-URL: https://build.opensuse.org/request/show/620431 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=1
2018-07-04 10:12:41 +02:00
#define AV_READ_TIME read_time
Copy Permalink