|
[-]
[+]
|
Deleted |
_service:tar_git:ffmpeg.changes
|
| @@ -1,10 +0,0 @@
-* Sun May 03 2020 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 4.2.2
-- [ffmpeg] Enable video4linux support
-- [ffmpeg] Update to version 4.2.2. Fixes JB#48620
-- [ffmpeg] Version 4.1.1, with OpenSUSE style encoder/decoder build config. JB#45026
-- [license] Fix license short name in .spec file. Contributes to JB#45486
-- [packaging] Enable indev v4l2
-- [packaging] Fixed libv4l2 lib name
-- [packaging] libv4l is called libv4l2
-- [packaging] Own ffmpeg directory, package license file. JB#22780
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:ffmpeg.spec
^
|
|
|
|
[-]
[+]
|
Added |
_service:tar_git:0001-backport-avcodec-x86-mathops-clip-constants-used-wit.patch
^
|
| @@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] backport: avcodec/x86/mathops: clip constants used with shift
+ instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+Signed-off-by: James Almer <jamrial@gmail.com>
+---
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+index 6298f5ed1983b84205479d1a714bd657435789f9..ca7e2dffc1076f82d2cabf55eae0681adbdcfb96 100644
+--- a/libavcodec/x86/mathops.h
++++ b/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+ int rt, dummy;
++ if (__builtin_constant_p(shift))
+ __asm__ (
+ "imull %3 \n\t"
+ "shrdl %4, %%edx, %%eax \n\t"
+ :"=a"(rt), "=d"(dummy)
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
+ );
++ else
++ __asm__ (
++ "imull %3 \n\t"
++ "shrdl %4, %%edx, %%eax \n\t"
++ :"=a"(rt), "=d"(dummy)
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
++ );
+ return rt;
+ }
+
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("sarl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("sarl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("shrl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("shrl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
|
|
|
Changed |
_service
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:enable_decoders
^
|
| @@ -1,8 +1,9 @@
## module name # reason for enablement in ffmpeg
aac
ac3
+alac # apple OSS - apache license
ansi # trivial
-apng
+apng # animated png
ass # trivial
ayuv # trivial
bmp # trivial
@@ -16,11 +17,13 @@
gsm # libgsm
huffyuv # trivial+zlib
ilbc # ilbc
+jpeg2000 # openjpeg2
libaom # libaom
libaom_av1 # libaom
-libcelt # celt, opus
libcodec2 # codec2
libgsm # libgsm
+libilbc # ilbc
+libjxl # libjxl
libopenjpeg # openjpeg
libopus # opus
libschroedinger # schroedinger
@@ -29,15 +32,15 @@
libvpx_vp8 # libvpx
libvpx_vp9 # libvpx
mjpeg # mjpegtools
-mpeg1video
-mpeg2video
-#mpeg4
mp1 # twolame/lame
mp1float # twolame/lame
mp2 # twolame
mp2float # twolame
mp3 # lame
mp3float # lame
+mpeg1video
+mpeg2video
+#mpeg4
opus # libopus
pam # trivial
pbm # trivial
@@ -72,6 +75,7 @@
pgm # trivial
pgmyuv # trivial
pgssub # mkvtoolnix
+pgx
png # libpng
ppm # trivial
rawvideo # trivial
|
|
[-]
[+]
|
Changed |
_service:tar_git:enable_encoders
^
|
| @@ -1,5 +1,7 @@
## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
aac
+ac3
+alac # apple OSS - apache license
apng # libpng
ass # trivial
ayuv # trival
@@ -9,26 +11,29 @@
flac # libFLAC
gif # libpng
huffyuv # trivial+zlib
+ilbc # ilbc
jpegls
+jpeg2000
libaom # libaom
libaom_av1 # libaom
libcodec2 # codec2
libgsm # libgsm
+libilbc # ilbc
+libjxl # libjxl
+libmp3lame # lame
libopenjpeg # openjpeg
libopus # opus
libschroedinger # schroedinger
libspeex # speex
libtheora # libtheora
libvorbis # libvorbis
-libvpx_vp8
-libvpx_vp9
-libwebp
-libwebp_anim
+libvpx_vp8 # libvpx
+libvpx_vp9 # libvpx
+libwebp # libwebp
+libwebp_anim # libwebp
mjpeg # mjpegtools
mpeg1video
mpeg2video
-mp2 # twolame
-mp2fixed # twolame
opus # opus
pam
pbm # trivial
|
|
|
Deleted |
_service:tar_git:ffmpeg-4.2.2.tar.bz2
^
|
|
|
Added |
_service:tar_git:ffmpeg-5.1.3+v4l2.20230905205330.8e8e46a.tar.bz2
^
|
