From 66ea0d09533d46f3fa445c1d47bf82c6af447454 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 21 Apr 2013 16:38:22 +0100 Subject: Revert windows installer ffmpeg DLL versions. --- windows/installer.nsi.32.in | 4 ++-- windows/installer.nsi.64.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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" -- cgit v1.2.3 From dd17ad210b3f4489949c908841f5e90136393dc8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 21 Apr 2013 17:49:54 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bbd1966f8..ffbbcfb2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-21 Carl Hetherington + + * Version 0.84 released. + 2013-04-21 Carl Hetherington * Version 0.84beta5 released. 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 Sun, 21 Apr 2013 17:49:54 +0100 + dvdomatic (0.84beta5-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 185763087..1d85d3fbf 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.84beta5' +VERSION = '0.84' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From e8d8a27c7f6861b031b3250b0ad50d04c41a7721 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 21 Apr 2013 17:49:54 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 1d85d3fbf..a9a057367 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.84' +VERSION = '0.85pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3