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

18 lines
503 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(-)
- Add ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch from OpenMandriva to optionally enable runtime enabling of fdkaac/lame/x264/x265 - Enable runtime enabling for fdkaac via --enable-libfdk-aac-dlopen OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=70
2019-06-11 13:21:23 +02:00
Index: ffmpeg-4.1.3/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
===================================================================
- Add ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch from OpenMandriva to optionally enable runtime enabling of fdkaac/lame/x264/x265 - Enable runtime enabling for fdkaac via --enable-libfdk-aac-dlopen OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=70
2019-06-11 13:21:23 +02:00
--- ffmpeg-4.1.3.orig/libavutil/arm/timer.h
+++ ffmpeg-4.1.3/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
@@ -24,7 +24,7 @@
#include <stdint.h>
#include "config.h"
-#if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__)
+#if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6ZK__)
#define AV_READ_TIME read_time
Copy Permalink