Author: kwizart
Update of /cvs/free/rpms/ffmpeg-compat/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7128/devel
Modified Files:
ffmpeg-compat.spec
Added Files:
ffmpeg-arm-fix.patch
Log Message:
Fixup arm
ffmpeg-arm-fix.patch:
jrevdct_arm.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE ffmpeg-arm-fix.patch ---
--- libavcodec/arm/jrevdct_arm.S 2014-11-24 14:20:06.352682781 +1100
+++ libavcodec/arm/jrevdct_arm.S 2014-11-24 13:26:48.930757553 +1100
@@ -61,7 +61,7 @@
stmdb sp!, { r4 - r12, lr } @ all callee saved regs
sub sp, sp, #4 @ reserve some space on the stack
- str r0, [ sp ] @ save the DCT pointer to the stack
+ str r0, [sp] @ save the DCT pointer to the stack
mov lr, r0 @ lr = pointer to the current row
mov r12, #8 @ r12 = row-counter
@@ -211,7 +211,7 @@
start_column_loop:
@ Start of column loop
- ldr lr, [ sp ]
+ ldr lr, [sp]
mov r12, #8
column_loop:
ldrsh r0, [lr, #( 0*8)] @ r0 = 'd0'
Index: ffmpeg-compat.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg-compat/devel/ffmpeg-compat.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ffmpeg-compat.spec 1 Sep 2014 02:25:53 -0000 1.20
+++ ffmpeg-compat.spec 24 Nov 2014 19:29:00 -0000 1.21
@@ -10,7 +10,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg-compat
Version: 0.6.7
-Release: 7%{?dist}
+Release: 8%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -23,6 +23,7 @@
Patch0: ffmpeg-0.6.6-compile-fix.patch
Patch1: 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch
Patch2: 0002-Add-unconditional-return-statement-to-yuva420_rgb32_.patch
+Patch3: ffmpeg-arm-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel
@@ -120,6 +121,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p0
%build
mkdir generic
@@ -233,6 +235,9 @@
%changelog
+* Mon Nov 24 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.7-8
+- Add patch for arm - reported by Tobias Brodel
+
* Mon Sep 01 2014 Sérgio Basto <sergio(a)serjux.com> - 0.6.7-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild