Set version to 0.4.6 and update release notes.

diff --git a/AUTHORS b/AUTHORS
index 89e7d76ade049b478df4f1116c01bcecf4c517d7..d91b719fc5fe6bb7edf984ad7addfc31c6001b8e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,6 @@ MLT module authors and maintainers:
 Charles Yates <charles.yates@pandora.be>
 Dan Dennedy <dan@dennedy.org>
 Stephane Fillod (effectv)
-Marco Gittler <g.marco@freenet.de> (frei0r, oldfilm)
+Marco Gittler <g.marco@freenet.de> (frei0r, oldfilm, qimage/kdenlivetitle)
 Jean-Baptiste Mardelle <jb@ader.ch> (kdenlive, qimage)
 Zachary Drew (motion_est)

diff --git a/Doxyfile b/Doxyfile
index c464976149de894d9acc6a42012d5c3796e25eca..2382786acf29754966670df48ec5e48214ce584c 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.4.4
+PROJECT_NUMBER = 0.4.6
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/NEWS b/NEWS
index e06d56b777f2dba38f1d6acfc6e8563f00df0904..341e468fd03a28916305f4db7036fa0446057bdc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,43 @@
 MLT Release Notes
 -----------------
 
+Version 0.4.6
+
+The recommended version of FFmpeg for use with this release is SVN r19873.
+This release is an enhancement release along with numerous build, A/V synch,
+concurrency, and other bug fixes.
+
+configure:  new option --avformat-svn-version
+
+modules:
+* avformat: much improved seeking on H.264/MPEG2-TS (AVCHD) (Ivan Schreter)
+* core: new imageconvert and audioconvert filters (framework refactorization)
+* linsys: new SDI consumer (Broadcast Centre Europe)
+* qimage: new kdenlivetitle producer (J.B. Mardelle and Marco Gittler)
+* sdl: new audio_only consumer for OS X
+
+mlt++ and swig: update bindings
+
+framework:
+* refactored image format conversion
+  mlt_frame.h:
+  - added convert_image() virtual function
+  - added mlt_image_format_name()
+  - removed many mlt_convert_ and scaling/padding functions
+* refactored audio format conversion
+  mlt_frame.h:
+  - mlt_get_audio() virtual function parameters changed
+  - added convert_audio() virtual function
+  - mlt_frame_get_audio() parameters changed
+  - added mlt_frame_set_audio()
+  - added mlt_audio_format_name()
+  mlt_types.h:
+  - deprecated mlt_audio_pcm
+  - added mlt_audio_s16
+  - added mlt_audio_s32
+  - added mlt_audio_float
+
+
 Version 0.4.4
 
 The recommended version of FFmpeg for use with this release is 0.5.0.

diff --git a/configure b/configure
index 3315473c1738f62d7c6a16121c82068f672d7bf9..b5303c09a9463ac920487a1ed1f265eeb67272d0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.4.5
+export version=0.4.6
 export soversion=2
 
 show_help()

diff --git a/docs/melt.1 b/docs/melt.1
index 13a6abe8423b4b662620d14a61524e705791deda..bbd15de3ab61cfb272e21e39bff94a12b66bfc7a 100644 (file)
--- a/docs/melt.1
+++ b/docs/melt.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH MELT "1" "June 2009" "MLT melt 0.4.4" "User Commands"
+.TH MELT "1" "June 2009" "MLT melt 0.4.6" "User Commands"
 .SH NAME
-melt \- manual page for MLT melt 0.4.4
+melt \- manual page for MLT melt 0.4.6
 .SH SYNOPSIS
 .B melt
 [\fIoptions\fR] [\fIproducer \fR[\fIname=value\fR]\fI* \fR]\fI+\fR

diff --git a/src/framework/mlt.h b/src/framework/mlt.h
index bad3688c76718d31f0926a3f8cfb1d22bf7a9ee3..1eb7f5198dfe4d4e0966d973224e29d2a6695e1d 100644 (file)
--- a/src/framework/mlt.h
+++ b/src/framework/mlt.h
@@ -23,8 +23,8 @@
 #ifndef _MLT_H_
 #define _MLT_H_
 
-#define LIBMLT_VERSION_INT ((0<<16)+(4<<8)+5)
-#define LIBMLT_VERSION     0.4.5
+#define LIBMLT_VERSION_INT ((0<<16)+(4<<8)+6)
+#define LIBMLT_VERSION     0.4.6
 
 #ifdef __cplusplus
 extern "C"