unmask latest ffmpeg

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b2cf8f60869bdf242765aea7c0192bd29f7649da..96aaa2fbde7d6938d8851f26c63c14e82d512a93 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9779 2015/02/11 13:46:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9780 2015/02/11 13:48:35 aballier Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  11 Feb 2015; Alexis Ballier <aballier@gentoo.org> package.mask:
+  unmask latest ffmpeg
+
   11 Feb 2015; Alexis Ballier <aballier@gentoo.org> package.mask:
   unmask latest gst-libav
 

diff --git a/profiles/package.mask b/profiles/package.mask
index fc5cef27708ce54f75d25dae114889819b1abbdb..d76922038028a9ca9da7dbbee2a91f24361d9dd2 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16347 2015/02/11 13:46:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16348 2015/02/11 13:48:35 aballier Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -344,10 +344,6 @@ app-admin/hwreport
 # FAIL:07:02:35 (00:00:00) db_verify_preop: expected 0, got 1
 =sys-libs/db-6.1*
 
-# Alexis Ballier <aballier@gentoo.org> (4 Aug 2014)
-# <vlc-2.2 will not work with this ffmpeg version; others to be investigated.
->=media-video/ffmpeg-2.3
-
 # Yixun Lan <dlan@gentoo.org> (17 Jul 2014)
 # Masked for proper testing. (Major updates in the code).
 =net-misc/tinc-1.1_pre*