diff -Nru gstreamer0.10-ffmpeg-0.10.13/debian/changelog gstreamer0.10-ffmpeg-0.10.13/debian/changelog --- gstreamer0.10-ffmpeg-0.10.13/debian/changelog 2012-04-23 07:12:44.000000000 +0000 +++ gstreamer0.10-ffmpeg-0.10.13/debian/changelog 2014-11-16 16:40:06.000000000 +0000 @@ -1,3 +1,27 @@ +gstreamer0.10-ffmpeg (0.10.13-5ubuntu1~utopic2) utopic; urgency=medium + + * For utopic + + -- Doug McMahon Sun, 16 Nov 2014 11:39:26 -0500 + +gstreamer0.10-ffmpeg (0.10.13-5ubuntu1~trusty2) trusty; urgency=medium + + * Add yasm + + -- Doug McMahon Wed, 26 Feb 2014 20:01:50 -0500 + +gstreamer0.10-ffmpeg (0.10.13-5ubuntu1~trusty1) trusty; urgency=medium + + * 2 build patches + + -- Doug McMahon Wed, 26 Feb 2014 19:18:33 -0500 + +gstreamer0.10-ffmpeg (0.10.13-5ubuntu1~trusty) trusty; urgency=medium + + * For trusty + + -- Doug McMahon Wed, 26 Feb 2014 18:49:15 -0500 + gstreamer0.10-ffmpeg (0.10.13-5) unstable; urgency=low * debian/control, diff -Nru gstreamer0.10-ffmpeg-0.10.13/debian/control gstreamer0.10-ffmpeg-0.10.13/debian/control --- gstreamer0.10-ffmpeg-0.10.13/debian/control 2012-04-23 07:12:10.000000000 +0000 +++ gstreamer0.10-ffmpeg-0.10.13/debian/control 2014-11-16 16:39:18.000000000 +0000 @@ -16,12 +16,9 @@ libgstreamer-plugins-base0.10-dev (>= 0.10.36), liborc-0.4-dev (>= 1:0.4.6), gstreamer-tools (>= 0.10.36), - libavcodec-dev (>= 4:0.7), - libpostproc-dev (>= 4:0.7), - libavformat-dev (>= 4:0.7), - libswscale-dev (>= 4:0.7), - libbz2-dev -Standards-Version: 3.8.4 + libbz2-dev, + yasm +Standards-Version: 3.9.5 Package: gstreamer0.10-ffmpeg Architecture: any diff -Nru gstreamer0.10-ffmpeg-0.10.13/debian/patches/fix-gcc.patch gstreamer0.10-ffmpeg-0.10.13/debian/patches/fix-gcc.patch --- gstreamer0.10-ffmpeg-0.10.13/debian/patches/fix-gcc.patch 1970-01-01 00:00:00.000000000 +0000 +++ gstreamer0.10-ffmpeg-0.10.13/debian/patches/fix-gcc.patch 2014-02-27 00:20:02.000000000 +0000 @@ -0,0 +1,39 @@ + +--- gstreamer0.10-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c ++++ gstreamer0.10-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c +@@ -398,7 +398,7 @@ static av_noinline void OPNAME ## h264_q + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ ++ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : "memory"\ + );\ + src += 4-(h+5)*srcStride;\ +@@ -446,7 +446,7 @@ static av_always_inline void OPNAME ## h + QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ + "2: \n\t"\ + : "+a"(src)\ +- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ ++ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ + : "memory"\ + );\ + tmp += 4;\ +@@ -823,7 +823,7 @@ static av_noinline void OPNAME ## h264_q + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ ++ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ + "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ + "memory"\ +@@ -878,7 +878,7 @@ static av_always_inline void put_h264_qp + QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) + "2: \n\t" + : "+a"(src) +- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) ++ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7",) + "memory" diff -Nru gstreamer0.10-ffmpeg-0.10.13/debian/patches/format-security.patch gstreamer0.10-ffmpeg-0.10.13/debian/patches/format-security.patch --- gstreamer0.10-ffmpeg-0.10.13/debian/patches/format-security.patch 1970-01-01 00:00:00.000000000 +0000 +++ gstreamer0.10-ffmpeg-0.10.13/debian/patches/format-security.patch 2014-02-27 00:20:11.000000000 +0000 @@ -0,0 +1,21 @@ + +--- gstreamer0.10-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/srtdec.c ++++ gstreamer0.10-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/srtdec.c +@@ -110,7 +110,7 @@ static const char *srt_to_ass(AVCodecCon + for (j=sptr-2; j>=0; j--) + if (stack[j].param[i][0]) { + out += snprintf(out, out_end-out, +- stack[j].param[i]); ++ "%s", stack[j].param[i]); + break; + } + } else { +@@ -146,7 +146,7 @@ static const char *srt_to_ass(AVCodecCon + for (i=0; i/dev/null) -DEB_CONFIGURE_EXTRA_FLAGS += --with-system-ffmpeg \ - --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --with-package-name=$(GST_PACKAGE_NAME) \ --with-package-origin=$(GST_PACKAGE_ORIGIN)