Release 1.0.41.0.4

5 files changed, 65 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index bd2acf3..e83e850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,43 @@
+=== release 1.0.4 ===
+
+2012-12-18  Tim-Philipp Müller <tim@centricular.net>
+
+	* configure.ac:
+	  releasing 1.0.4
+
+2012-12-12 17:01:28 +0100  Wim Taymans <wim.taymans@collabora.co.uk>
+
+	* ext/libav/gstavcodecmap.c:
+	  avcodec: set bits_per_coded_sample for G726
+	  Use the bitrate and the samplerate to set the bits_per_coded_sample for G726
+	  because the decoder needs this.
+
+2012-12-10 14:54:03 +0100  Rasmus Rohde <rohde@duff.dk>
+
+	* ext/libav/gstavpipe.h:
+	  Fix incorrect use of object in log statement. We are given a pointer to the object and should not try to take the address of it.
+
+2012-11-21 13:05:54 +0000  Tim-Philipp Müller <tim@centricular.net>
+
+	* configure.ac:
+	  Back to development (bug fixing)
+
 === release 1.0.3 ===
 
-2012-11-21  Tim-Philipp Müller <tim@centricular.net>
+2012-11-21 11:13:07 +0000  Tim-Philipp Müller <tim@centricular.net>
 
+	* ChangeLog:
+	* NEWS:
+	* RELEASE:
 	* configure.ac:
-	  releasing 1.0.3
+	* gst-libav.doap:
+	  Release 1.0.3
+
+2012-11-21 11:10:49 +0000  Tim-Philipp Müller <tim@centricular.net>
+
+	* gst-libs/ext/Makefile.am:
+	  Revert "Revert "ffmpeg: Fix make dist""
+	  This reverts commit 2aab13b9aed1ff7e9a17be07b3184ebd0869afe0.
 
 2012-11-19 14:10:23 +0100  Sebastian Dröge <sebastian.droege@collabora.co.uk>
 
diff --git a/NEWS b/NEWS
index e9385cc..b84dc8a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
-This is GStreamer Libav Plugins 1.0.3
+This is GStreamer Libav Plugins 1.0.4
+
+Changes since 1.0.3:
+
+      * G.726 decoder fixes
+
+Bugs fixed since 1.0.3:
+
+      * 689975 : Incorrect use of object in log statement
 
 Changes since 1.0.2:
 
diff --git a/RELEASE b/RELEASE
index 2b03fcf..3215362 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,5 +1,5 @@
 
-Release notes for GStreamer libav Plugins 1.0.3
+Release notes for GStreamer libav Plugins 1.0.4
 
 The GStreamer team is proud to announce a new bug-fix release
 in the 1.x stable series of the
@@ -38,10 +38,11 @@ contains a set of less supported plugins that haven't passed the
 
 Features of this release
     
-      * avcodecmap: Y41B is YUV411P, not YUV410P
+      * G.726 decoder fixes
 
-There were no bugs fixed in this release
-    
+Bugs fixed in this release
+
+      * 689975 : Incorrect use of object in log statement
 
 ==== Download ====
 
@@ -78,6 +79,7 @@ subscribe to the gstreamer-devel list.
         
 Contributors to this release
     
-      * Sebastian Dröge
+      * Rasmus Rohde
       * Tim-Philipp Müller
- 
\ No newline at end of file
+      * Wim Taymans
+ 
diff --git a/configure.ac b/configure.ac
index a271c14..cd1c44f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.62)
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(GStreamer libav, 1.0.3.1,
+AC_INIT(GStreamer libav, 1.0.4,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-libav)
 
@@ -42,7 +42,7 @@ GST_API_VERSION=1.0
 AC_SUBST(GST_API_VERSION)
 
 AG_GST_LIBTOOL_PREPARE
-AS_LIBTOOL(GST, 3, 0, 3)
+AS_LIBTOOL(GST, 4, 0, 4)
 
 dnl *** required versions of GStreamer stuff ***
 GST_REQ=1.0.0
diff --git a/gst-libav.doap b/gst-libav.doap
index 5b71519..ded998d 100644
--- a/gst-libav.doap
+++ b/gst-libav.doap
@@ -34,6 +34,16 @@ colorspace conversion elements.
 
  <release>
   <Version>
+   <revision>1.0.4</revision>
+   <branch>1.0</branch>
+   <name></name>
+   <created>2012-12-18</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.0.4.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
    <revision>1.0.3</revision>
    <branch>1.0</branch>
    <name></name>