Merge branch 'master' into debian-dbg

5 files changed, 15 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index bbd1966f8..ffbbcfb2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-04-21  Carl Hetherington  <cth@carlh.net>
 
+	* Version 0.84 released.
+
+2013-04-21  Carl Hetherington  <cth@carlh.net>
+
 	* Version 0.84beta5 released.
 
 2013-04-20  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index f9146ff6e..eab1f4b4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.84-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sun, 21 Apr 2013 17:49:54 +0100
+
 dvdomatic (0.84beta5-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in
index 03ebeeab2..ac68ac88b 100644
--- a/windows/installer.nsi.32.in
+++ b/windows/installer.nsi.32.in
@@ -28,9 +28,9 @@ Section "install" "Installation info"
 SetOutPath "$INSTDIR\bin"
 
 File "%deps%/bin/asdcp-libdcp.dll"
-File "%deps%/bin/avcodec-55.dll"
+File "%deps%/bin/avcodec-54.dll"
 File "%deps%/bin/avfilter-3.dll"
-File "%deps%/bin/avformat-55.dll"
+File "%deps%/bin/avformat-54.dll"
 File "%deps%/bin/avutil-52.dll"
 File "%deps%/bin/dcp.dll"
 File "%deps%/bin/libintl-8.dll"
diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 3b53c637b..233d7f65e 100644
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -38,9 +38,9 @@ ${EndIf}
 SetOutPath "$INSTDIR\bin"
 
 File "%deps%/bin/asdcp-libdcp.dll"
-File "%deps%/bin/avcodec-55.dll"
+File "%deps%/bin/avcodec-54.dll"
 File "%deps%/bin/avfilter-3.dll"
-File "%deps%/bin/avformat-55.dll"
+File "%deps%/bin/avformat-54.dll"
 File "%deps%/bin/avutil-52.dll"
 File "%deps%/bin/dcp.dll"
 File "%deps%/bin/libintl-8.dll"
diff --git a/wscript b/wscript
index 185763087..a9a057367 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.84beta5'
+VERSION = '0.85pre'
 
 def options(opt):
     opt.load('compiler_cxx')