rpms/ffmpeg-compat/devel 0002-Add-unconditional-return-statement-to-yuva420_rgb32_.patch, NONE, 1.1 ffmpeg-compat.spec, 1.13, 1.14

Author: kwizart Update of /cvs/free/rpms/ffmpeg-compat/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4757/devel Modified Files: ffmpeg-compat.spec Added Files: 0002-Add-unconditional-return-statement-to-yuva420_rgb32_.patch Log Message: Fix build 0002-Add-unconditional-return-statement-to-yuva420_rgb32_.patch: yuv2rgb_template.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- NEW FILE 0002-Add-unconditional-return-statement-to-yuva420_rgb32_.patch --- From: Diego Biurrun <diego(a)biurrun.de&gt; Date: Sun, 10 Apr 2011 21:12:08 +0200 Subject: [PATCH 2/2] Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When HAVE_7REGS was not defined these functions had an empty body causing the following warnings during compilation. In file included from libswscale/x86/yuv2rgb_mmx.c:58: libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_rgb32_MMX’: libswscale/x86/yuv2rgb_template.c:412: warning: no return statement in function returning non-void libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_bgr32_MMX’: libswscale/x86/yuv2rgb_template.c:457: warning: no return statement in function returning non-void Signed-off-by: Diego Biurrun <diego(a)biurrun.de&gt; Conflicts: libswscale/x86/yuv2rgb_template.c --- libswscale/x86/yuv2rgb_template.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libswscale/x86/yuv2rgb_template.c b/libswscale/x86/yuv2rgb_template.c index ba90689..6016923 100644 --- a/libswscale/x86/yuv2rgb_template.c +++ b/libswscale/x86/yuv2rgb_template.c @@ -524,6 +524,8 @@ static inline int RENAME(yuva420_rgb32)(SwsContext *c, const uint8_t* src[], int YUV2RGB_ENDLOOP(4) YUV2RGB_OPERANDS_ALPHA +#else + return 0; #endif } @@ -560,5 +562,7 @@ static inline int RENAME(yuva420_bgr32)(SwsContext *c, const uint8_t* src[], int YUV2RGB_ENDLOOP(4) YUV2RGB_OPERANDS_ALPHA +#else + return 0; #endif } -- 1.7.11.7 Index: ffmpeg-compat.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg-compat/devel/ffmpeg-compat.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ffmpeg-compat.spec 1 Oct 2013 18:48:24 -0000 1.13 +++ ffmpeg-compat.spec 1 Oct 2013 20:52:00 -0000 1.14 @@ -22,6 +22,7 @@ Source1: ffmpeg-snapshot.sh 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel @@ -118,6 +119,7 @@ %setup -q -n ffmpeg-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build mkdir generic