From 6e78eec662eaf6bb8a1f2f009ed4e7904c7cad11 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Mon, 13 May 2013 14:42:32 +0000
Subject: 1.2.1 was released on 2013-05-10. It is the latest stable FFmpeg
 release from the 1.2 release branch, which was cut from master on 2013-03-07.
 Amongst lots of other changes, it includes all changes from ffmpeg-mt, libav
 master of 2013-03-07, libav 9 as of 2013-03-07.

---
 multimedia/ffmpeg/Makefile        | 5 ++---
 multimedia/ffmpeg/Makefile.common | 4 ++--
 multimedia/ffmpeg/distinfo        | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 5bb174acc6f..f7319fb21eb 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2013/05/10 06:13:30 riastradh Exp $
+# $NetBSD: Makefile,v 1.107 2013/05/13 14:42:32 adam Exp $
 
-PKGNAME=	ffmpeg-20130315.${DISTVERSION}
-PKGREVISION=	1
+PKGNAME=	ffmpeg-20130510.${DISTVERSION}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
index 1191bd91a37..4d0dd0dfd06 100644
--- a/multimedia/ffmpeg/Makefile.common
+++ b/multimedia/ffmpeg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2013/03/17 15:18:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.32 2013/05/13 14:42:32 adam 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.2
+DISTVERSION=	1.2.1
 PREV_PKGPATH=	multimedia/ffmpeg-devel
 PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg/patches
 
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 91d99e81b02..32e090d0f72 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.67 2013/03/17 15:18:11 wiz Exp $
+$NetBSD: distinfo,v 1.68 2013/05/13 14:42:32 adam Exp $
 
-SHA1 (ffmpeg-1.2.tar.bz2) = e1df2389560da95e1a76f9375f054e630c7e2602
-RMD160 (ffmpeg-1.2.tar.bz2) = f1b1122ee39276cf5eb00b4113794a2c23c1e66f
-Size (ffmpeg-1.2.tar.bz2) = 5969590 bytes
+SHA1 (ffmpeg-1.2.1.tar.bz2) = 930e5612d75d04fdf7c0579f4d85d47e31e38945
+RMD160 (ffmpeg-1.2.1.tar.bz2) = bbccff41da7fb5731051b5bd4ececc41ed1d5749
+Size (ffmpeg-1.2.1.tar.bz2) = 5968378 bytes
 SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
 SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
-- 
cgit v1.2.3