Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b06e8e150b51424b3a1824cfba97520d527ed335..b0cadb8c73fe4ca743664d23abc352936e757700 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
-ffmpeg (7:2.4.3~trusty1) trusty; urgency=medium
+ffmpeg (7:2.5.0~trusty1.1) trusty; urgency=medium
 
-  * New bugfix release
+  * Enable libvo-aacenc in odd chance it's used
 
- -- Doug McMahon <mc631man@gmail.com>  Fri, 07 Nov 2014 14:38:48 -0500
+ -- Doug McMahon <mc631man@gmail.com>  Sat, 06 Dec 2014 08:32:16 -0500
+
+ffmpeg (7:2.5.0~trusty1) trusty; urgency=medium
+
+  * Let's test xcbgrab: XCB-based screen capture
+  * Link ffserver in case of value
+
+ -- Doug McMahon <mc631man@gmail.com>  Thu, 04 Dec 2014 08:49:38 -0500
+
+ffmpeg (7:2.5.0~trusty) trusty; urgency=medium
+
+  * New upstream release 2.5
+
+ -- Doug McMahon <mc631man@gmail.com>  Thu, 04 Dec 2014 08:02:31 -0500
 
 ffmpeg (7:2.4.2~trusty1.1) trusty; urgency=medium