Update to a newer FFmpeg snapshot, including security and stability fixes:

- vqavideo: return error if image size is not a multiple of block size (CVE-2012-0947)
- h263dec: Disallow width/height changing with frame threads (CVE-2011-3937)
- adpcm: ADPCM Electronic Arts has always two channels (CVE-2012-0852)
- h264: Add check for invalid chroma_format_idc (CVE-2012-0851)
- dpcm: ignore extra unpaired bytes in stereo streams (CVE-2011-3951)
- rtpdec_asf: Fix integer underflow that could allow remote code execution (CVE-2011-4031)
- aacsbr: prevent out of bounds memcpy() (CVE-2012-0850)
- kmvc: Check palsize (CVE-2011-3952)

Further bugfixes in the following codecs: ea, png, qdm2, tqi, motionpixels

From Brad, ok jasper@.

graphics/ffmpeg/Makefile

@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.86 2012/04/28 08:41:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.87 2012/06/09 23:05:49 sthen Exp $
 
 COMMENT=	audio/video converter and streamer
 
-V=		20120422
+V=		20120609
 DISTNAME=	ffmpeg-git-${V}
 PKGNAME=	ffmpeg-${V}
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://comstyle.com/source/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 SHARED_LIBS=	avcodec		17.0 \
 		avdevice	5.0 \

graphics/ffmpeg/distinfo

@@ -1,5 +1,5 @@
-MD5 (ffmpeg-git-20120422.tar.bz2) = FIvZR59fVAYWfyYA3SibHQ==
-RMD160 (ffmpeg-git-20120422.tar.bz2) = EFkAKIN6d6XvX/rVL4A+cDSeGNc=
-SHA1 (ffmpeg-git-20120422.tar.bz2) = 3ivLDfdrywb5n9fu4DyVyeCwIlg=
-SHA256 (ffmpeg-git-20120422.tar.bz2) = zbO5f21FhD+X1HgeIsdFbCPNgOswuIqHhx2iZXgAVyc=
-SIZE (ffmpeg-git-20120422.tar.bz2) = 4488962
+MD5 (ffmpeg-git-20120609.tar.xz) = oPeMM2LbRMVYiq//1ltLUw==
+RMD160 (ffmpeg-git-20120609.tar.xz) = 2jZZY0nGLzYipAEQz4HvqQksDwQ=
+SHA1 (ffmpeg-git-20120609.tar.xz) = u2kA9Y+/INdVPO5eobNGxU4rDPM=
+SHA256 (ffmpeg-git-20120609.tar.xz) = NY0ZwuYSMrE0iXfLSZtCmKMbEhE7W5gdj69it8ZfK1Q=
+SIZE (ffmpeg-git-20120609.tar.xz) = 3854728