Author: kwizart Update of /cvs/free/rpms/ffmpeg-compat/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5494/F-18 Added Files: 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch 0002-Add-unconditional-return-statement-to-yuva420_rgb32_.patch ffmpeg-0.6.6-compile-fix.patch Log Message: Add patches 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch: h264dsp_init_arm.c | 4 +++- h264pred_init_arm.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) --- NEW FILE 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch --- From: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Sat, 29 Jun 2013 14:12:59 +0200 Subject: [PATCH] Fix build when seletected fpu is not neon on arm --- libavcodec/arm/h264dsp_init_arm.c | 4 +++- libavcodec/arm/h264pred_init_arm.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index c06c3d0..7014d1a 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -122,5 +122,7 @@ static void ff_h264dsp_init_neon(H264DSPContext *c) void ff_h264dsp_init_arm(H264DSPContext *c) { - if (HAVE_NEON) ff_h264dsp_init_neon(c); +#if HAVE_NEON + ff_h264dsp_init_neon(c); +#endif } diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c index a7d9960..8574ff0 100644 --- a/libavcodec/arm/h264pred_init_arm.c +++ b/libavcodec/arm/h264pred_init_arm.c @@ -72,5 +72,7 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id) void ff_h264_pred_init_arm(H264PredContext *h, int codec_id) { - if (HAVE_NEON) ff_h264_pred_init_neon(h, codec_id); +#if HAVE_NEON + ff_h264_pred_init_neon(h, codec_id); +#endif } -- 1.7.1 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 ffmpeg-0.6.6-compile-fix.patch: vaapi_mpeg4.c | 1 + 1 file changed, 1 insertion(+) --- NEW FILE ffmpeg-0.6.6-compile-fix.patch --- diff -up ffmpeg-0.6.6/libavcodec/vaapi_mpeg4.c~ ffmpeg-0.6.6/libavcodec/vaapi_mpeg4.c --- ffmpeg-0.6.6/libavcodec/vaapi_mpeg4.c~ 2012-06-09 22:09:09.000000000 +0200 +++ ffmpeg-0.6.6/libavcodec/vaapi_mpeg4.c 2013-05-05 20:34:05.537171756 +0200 @@ -21,6 +21,7 @@ */ #include "vaapi_internal.h" +#include "h263.h" /** Reconstruct bitstream intra_dc_vlc_thr */ static int mpeg4_get_intra_dc_vlc_thr(MpegEncContext *s)