Set version to 0.8.4

diff --git a/Doxyfile b/Doxyfile
index 86ede9f1ed6482fefb45226d81cdbaedea79855e..791d2ed4ae4217ed79f5312af3ff98ba88b8687b 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = mlt
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER = 0.8.2
+PROJECT_NUMBER = 0.8.4
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/configure b/configure
index c9c6e00fda72a131b162d861e1b74fb1fc85cd6b..6986def57703f7113fc281950df0b17a2b160b5e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.8.3
+export version=0.8.4
 export soversion=5
 
 show_help()

diff --git a/docs/melt.1 b/docs/melt.1
index f146fd56ed264f0b1cbaecf7eb5d4bcf3fac72dd..37831a8c84ea8aa4b9a0a9b2cc639474b0b79d9a 100644 (file)
--- a/docs/melt.1
+++ b/docs/melt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.4.
-.TH MELT "1" "August 2012" "melt 0.8.2" "User Commands"
+.TH MELT "1" "November 2012" "melt 0.8.4" "User Commands"
 .SH NAME
 melt \- author, play, and encode multitrack audio/video compositions
 .SH SYNOPSIS

diff --git a/src/framework/mlt_version.h b/src/framework/mlt_version.h
index 890a060048996a9fc26b9bbb015ef907cda63279..03ed2773e34902c6688f63da7f22e1b4db7f763b 100644 (file)
--- a/src/framework/mlt_version.h
+++ b/src/framework/mlt_version.h
@@ -29,7 +29,7 @@
 
 #define LIBMLT_VERSION_MAJOR    0
 #define LIBMLT_VERSION_MINOR    8
-#define LIBMLT_VERSION_REVISION 3
+#define LIBMLT_VERSION_REVISION 4
 #define LIBMLT_VERSION_INT      ((LIBMLT_VERSION_MAJOR<<16)+(LIBMLT_VERSION_MINOR<<8)+LIBMLT_VERSION_REVISION)
 #define LIBMLT_VERSION          STRINGIZE(LIBMLT_VERSION_MAJOR.LIBMLT_VERSION_MINOR.LIBMLT_VERSION_REVISION)
 

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 9824d3362553855ef63cdcaa5c832730bde09829..c8f55a387071cf2295c4bd6332a4a610739247bc 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -3,8 +3,8 @@
 # Determine whether to recommend/use the HEAD revision of FFmpeg (unreleased)
 # or a specific revision based upon whether the last digit of our version
 # is even or odd. An odd MLT version number always represents unreleased.
-ffmpeg_ver="0.10.4"
-libav_ver="0.8.3"
+ffmpeg_ver="1.0"
+libav_ver="0.8.4"
 micro_version=$(echo $version | cut -d . -f 3)
 odd_version=$(($micro_version % 2))
 [ "$odd_version" -eq "1" ] && ffmpeg_ver="HEAD" && libav_ver="HEAD"