Update to 1.2:

version 1.2:

- VDPAU hardware acceleration through normal hwaccel
- SRTP support
- Error diffusion dither in Swscale
- Chained Ogg support
- Theora Midstream reconfiguration support
- EVRC decoder
- audio fade filter
- filtering audio with unknown channel layout
- allpass, bass, bandpass, bandreject, biquad, equalizer, highpass, lowpass
  and treble audio filter
- improved showspectrum filter, with multichannel support and sox-like colors
- histogram filter
- tee muxer
- il filter ported from libmpcodecs
- support ID3v2 tags in ASF files
- encrypted TTA stream decoding support
- RF64 support in WAV muxer
- noise filter ported from libmpcodecs
- Subtitles character encoding conversion
- blend filter
- stereo3d filter ported from libmpcodecs

4 files changed, 16 insertions, 15 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index f1bbdd2aaac..397fb75efa6 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2013/03/02 09:57:02 adam Exp $
+# $NetBSD: Makefile,v 1.104 2013/03/17 15:18:11 wiz Exp $
 
-PKGNAME=	ffmpeg-20130223.${DISTVERSION}
+PKGNAME=	ffmpeg-20130315.${DISTVERSION}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
index a743177c4e8..1191bd91a37 100644
--- a/multimedia/ffmpeg/Makefile.common
+++ b/multimedia/ffmpeg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2013/03/02 09:57:02 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2013/03/17 15:18:11 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.3
+DISTVERSION=	1.2
 PREV_PKGPATH=	multimedia/ffmpeg-devel
 PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg/patches
 
diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST
index 403e845aa63..f88c37c84e2 100644
--- a/multimedia/ffmpeg/PLIST
+++ b/multimedia/ffmpeg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2013/01/16 20:55:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2013/03/17 15:18:11 wiz Exp $
 bin/ffmpeg
 bin/ffprobe
 bin/ffserver
@@ -45,6 +45,7 @@ include/libavutil/error.h
 include/libavutil/eval.h
 include/libavutil/fifo.h
 include/libavutil/file.h
+include/libavutil/hmac.h
 include/libavutil/imgutils.h
 include/libavutil/intfloat.h
 include/libavutil/intfloat_readwrite.h
@@ -78,23 +79,23 @@ include/libswscale/version.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.54
-lib/libavcodec.so.54.86.100
+lib/libavcodec.so.54.92.100
 lib/libavdevice.a
 lib/libavdevice.so
 lib/libavdevice.so.54
-lib/libavdevice.so.54.3.102
+lib/libavdevice.so.54.3.103
 lib/libavfilter.a
 lib/libavfilter.so
 lib/libavfilter.so.3
-lib/libavfilter.so.3.32.100
+lib/libavfilter.so.3.42.103
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.54
-lib/libavformat.so.54.59.106
+lib/libavformat.so.54.63.104
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.52
-lib/libavutil.so.52.13.100
+lib/libavutil.so.52.18.100
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.52
@@ -106,7 +107,7 @@ lib/libswresample.so.0.17.102
 lib/libswscale.a
 lib/libswscale.so
 lib/libswscale.so.2
-lib/libswscale.so.2.1.103
+lib/libswscale.so.2.2.100
 lib/pkgconfig/libavcodec.pc
 lib/pkgconfig/libavdevice.pc
 lib/pkgconfig/libavfilter.pc
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 084db15fa66..91d99e81b02 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.66 2013/03/02 09:57:02 adam Exp $
+$NetBSD: distinfo,v 1.67 2013/03/17 15:18:11 wiz Exp $
 
-SHA1 (ffmpeg-1.1.3.tar.bz2) = d82d6f53c5130ee21dcb87f76bdbdf768d3f0db9
-RMD160 (ffmpeg-1.1.3.tar.bz2) = 4928794fb16c3943372104dfc47ee77bb31359ac
-Size (ffmpeg-1.1.3.tar.bz2) = 5812644 bytes
+SHA1 (ffmpeg-1.2.tar.bz2) = e1df2389560da95e1a76f9375f054e630c7e2602
+RMD160 (ffmpeg-1.2.tar.bz2) = f1b1122ee39276cf5eb00b4113794a2c23c1e66f
+Size (ffmpeg-1.2.tar.bz2) = 5969590 bytes
 SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
 SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e