rpms/gstreamer-ffmpeg/devel libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch, NONE, 1.1 gstreamer-ffmpeg.spec, 1.25, 1.26

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/gstreamer-ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23364

Modified Files:
	gstreamer-ffmpeg.spec 
Added Files:
	libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch 
Log Message:
* Sun Mar 10 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 0.10.13-7
- Add a patch from upstream libav to fix miscompilation with gcc-4.8
  (rf#2713, libav#388)


libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch:
 dsputil.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch ---
>From ae8f132ace291534ed64023029023c2338f8d3bb Mon Sep 17 00:00:00 2001
From: Sebastian Keller <sebastian-keller at gmx.de>
Date: Sat, 9 Mar 2013 23:57:14 +0100
Subject: [PATCH] dsputil: fix segfault in dsputil_init with gcc 4.8

---
 libavcodec/dsputil.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 66f1f93..621b00c 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2788,7 +2788,7 @@ int ff_check_alignment(void){
 
 av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)
 {
-    int i;
+    int i, j;
 
     ff_check_alignment();
 
@@ -3154,11 +3154,13 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)
     if (ARCH_SH4)        dsputil_init_sh4   (c, avctx);
     if (ARCH_BFIN)       dsputil_init_bfin  (c, avctx);
 
-    for(i=0; i<64; i++){
-        if(!c->put_2tap_qpel_pixels_tab[0][i])
-            c->put_2tap_qpel_pixels_tab[0][i]= c->put_h264_qpel_pixels_tab[0][i];
-        if(!c->avg_2tap_qpel_pixels_tab[0][i])
-            c->avg_2tap_qpel_pixels_tab[0][i]= c->avg_h264_qpel_pixels_tab[0][i];
+    for(i=0; i<4; i++){
+        for(j=0; j<16; j++) {
+            if(!c->put_2tap_qpel_pixels_tab[i][j])
+                c->put_2tap_qpel_pixels_tab[i][j]= c->put_h264_qpel_pixels_tab[i][j];
+            if(!c->avg_2tap_qpel_pixels_tab[i][j])
+                c->avg_2tap_qpel_pixels_tab[i][j]= c->avg_h264_qpel_pixels_tab[i][j];
+        }
     }
 
     ff_init_scantable_permutation(c->idct_permutation,
-- 
1.8.1.4



Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/gstreamer-ffmpeg.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gstreamer-ffmpeg.spec	2 Mar 2013 12:20:25 -0000	1.25
+++ gstreamer-ffmpeg.spec	10 Mar 2013 12:35:49 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           gstreamer-ffmpeg
 Version:        0.10.13
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GStreamer FFmpeg-based plug-ins
 Group:          Applications/Multimedia
 # the ffmpeg plugin is LGPL, the postproc plugin is GPL
@@ -23,6 +23,8 @@
 Patch10:        0010-ffmpegdec-Use-auto-threads-if-available-and-only-sli.patch
 Patch11:        0011-ffmux-Use-correct-enum-type-for-return-value.patch
 Patch12:        0012-ffdec-don-t-flush-buffers-on-DISCONT.patch
+# Patch from libav bug 469 to fix compile with gcc-4.8
+Patch13:        libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch
 BuildRequires:  gstreamer-devel >= 0.10.0
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
 BuildRequires:  orc-devel bzip2-devel zlib-devel
@@ -43,8 +45,6 @@
 
 %prep
 %setup -q -n gst-ffmpeg-%{version} -a 1
-rm -r gst-libs/ext/libav
-mv libav-0.8.5 gst-libs/ext/libav
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -58,6 +58,11 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+pushd libav-0.8.5
+%patch13 -p1
+popd
+rm -r gst-libs/ext/libav
+mv libav-0.8.5 gst-libs/ext/libav
 
 
 %build
@@ -83,6 +88,10 @@
 
 
 %changelog
+* Sun Mar 10 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 0.10.13-7
+- Add a patch from upstream libav to fix miscompilation with gcc-4.8
+  (rf#2713, libav#388)
+
 * Sat Mar  2 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 0.10.13-6
 - Upgrade the buildin libav to 0.8.5 to get all the security fixes from
   upstream libav