Update to 1.1.1:

- Fix a crash on windows platforms related to automatic stack alignment
  in libavresample
- Fix memleaks in the ogg demuxer. Related to CVE-2012-2882

4 files changed, 8 insertions, 39 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index e101e0254c1..24a5068ccf9 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.99 2013/01/21 13:25:07 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2013/01/21 14:50:42 wiz Exp $
 
-PKGNAME=	ffmpeg-20130106.${DISTVERSION}
-PKGREVISION=	1
+PKGNAME=	ffmpeg-20130120.${DISTVERSION}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
index 9463a89b46a..7e0a18bbe16 100644
--- a/multimedia/ffmpeg/Makefile.common
+++ b/multimedia/ffmpeg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2013/01/16 20:55:47 adam Exp $
+# $NetBSD: Makefile.common,v 1.28 2013/01/21 14:50:42 wiz Exp $
 # used by multimedia/ffplay/Makefile
 # used by multimedia/ffmpeg/Makefile
 
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
 
-DISTVERSION=	1.1
+DISTVERSION=	1.1.1
 PREV_PKGPATH=	multimedia/ffmpeg-devel
 PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg/patches
 
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 75d7784d07f..82b43d26a3b 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.63 2013/01/16 20:55:47 adam Exp $
+$NetBSD: distinfo,v 1.64 2013/01/21 14:50:42 wiz Exp $
 
-SHA1 (ffmpeg-1.1.tar.bz2) = a006d8833dd7a03dd5b7823671995640322177fe
-RMD160 (ffmpeg-1.1.tar.bz2) = 457524e69a51901fb27ad561cc6a5ccba96515fe
-Size (ffmpeg-1.1.tar.bz2) = 5808278 bytes
+SHA1 (ffmpeg-1.1.1.tar.bz2) = ad02037de190fb04611ec5347c5a97130249bebf
+RMD160 (ffmpeg-1.1.1.tar.bz2) = 14dd4d0f324d982194bcbed56232a0a0af2b3285
+Size (ffmpeg-1.1.1.tar.bz2) = 5808380 bytes
 SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
 SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
 SHA1 (patch-configure) = 2a1085bef529b883270a4d55450c202f83c478db
-SHA1 (patch-libavcodec_x86_dsputil_mmx.c) = ac2230a524673ac42f7e1a29090ab7ab5561b3d2
diff --git a/multimedia/ffmpeg/patches/patch-libavcodec_x86_dsputil_mmx.c b/multimedia/ffmpeg/patches/patch-libavcodec_x86_dsputil_mmx.c
deleted file mode 100644
index 46e5753bf88..00000000000
--- a/multimedia/ffmpeg/patches/patch-libavcodec_x86_dsputil_mmx.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-libavcodec_x86_dsputil_mmx.c,v 1.1 2013/01/16 20:55:47 adam Exp $
-
---- libavcodec/x86/dsputil_mmx.c.orig	2013-01-06 21:53:29.000000000 +0000
-+++ libavcodec/x86/dsputil_mmx.c
-@@ -1785,6 +1785,7 @@ static av_always_inline void gmc(uint8_t
-     }
- }
- 
-+#if CONFIG_VIDEODSP
- #if HAVE_YASM
- #if ARCH_X86_32
- static void gmc_mmx(uint8_t *dst, uint8_t *src,
-@@ -1814,6 +1815,7 @@ static void gmc_mmx(uint8_t *dst, uint8_
-         width, height, &ff_emulated_edge_mc_8);
- }
- #endif
-+#endif
- 
- #endif /* HAVE_INLINE_ASM */
- 
-@@ -2518,7 +2520,7 @@ static void dsputil_init_sse(DSPContext 
-     c->scalarproduct_float          = ff_scalarproduct_float_sse;
-     c->butterflies_float_interleave = ff_butterflies_float_interleave_sse;
- 
--#if HAVE_INLINE_ASM
-+#if HAVE_INLINE_ASM && CONFIG_VIDEODSP
-     c->gmc = gmc_sse;
- #endif
- #endif /* HAVE_YASM */