Imported Upstream version 1.0.4upstream/1.0.4

10 files changed, 103 insertions, 30 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/configure b/configure
index b7ea1af..6bd6234 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GStreamer libav 1.0.3.
+# Generated by GNU Autoconf 2.69 for GStreamer libav 1.0.4.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GStreamer libav'
 PACKAGE_TARNAME='gst-libav'
-PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='GStreamer libav 1.0.3'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='GStreamer libav 1.0.4'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer'
 PACKAGE_URL=''
 
@@ -1505,7 +1505,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GStreamer libav 1.0.3 to adapt to many kinds of systems.
+\`configure' configures GStreamer libav 1.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1576,7 +1576,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GStreamer libav 1.0.3:";;
+     short | recursive ) echo "Configuration of GStreamer libav 1.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1738,7 +1738,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GStreamer libav configure 1.0.3
+GStreamer libav configure 1.0.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2153,7 +2153,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GStreamer libav $as_me 1.0.3, which was
+It was created by GStreamer libav $as_me 1.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3083,7 +3083,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gst-libav'
- VERSION='1.0.3'
+ VERSION='1.0.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3206,9 +3206,9 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
-  PACKAGE_VERSION_MAJOR=$(echo 1.0.3 | cut -d'.' -f1)
-  PACKAGE_VERSION_MINOR=$(echo 1.0.3 | cut -d'.' -f2)
-  PACKAGE_VERSION_MICRO=$(echo 1.0.3 | cut -d'.' -f3)
+  PACKAGE_VERSION_MAJOR=$(echo 1.0.4 | cut -d'.' -f1)
+  PACKAGE_VERSION_MINOR=$(echo 1.0.4 | cut -d'.' -f2)
+  PACKAGE_VERSION_MICRO=$(echo 1.0.4 | cut -d'.' -f3)
 
 
 
@@ -3219,7 +3219,7 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5
 $as_echo_n "checking nano version... " >&6; }
 
-  NANO=$(echo 1.0.3 | cut -d'.' -f4)
+  NANO=$(echo 1.0.4 | cut -d'.' -f4)
 
   if test x"$NANO" = x || test "x$NANO" = "x0" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5
@@ -5118,7 +5118,8 @@ else
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -6649,7 +6650,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -7798,10 +7806,10 @@ fi
 done
 
 
-  GST_CURRENT=3
+  GST_CURRENT=4
   GST_REVISION=0
-  GST_AGE=3
-  GST_LIBVERSION=3:0:3
+  GST_AGE=4
+  GST_LIBVERSION=4:0:4
 
 
 
@@ -17810,7 +17818,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GStreamer libav $as_me 1.0.3, which was
+This file was extended by GStreamer libav $as_me 1.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17876,7 +17884,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GStreamer libav config.status 1.0.3
+GStreamer libav config.status 1.0.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 2504ea6..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,
+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/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
index 10b310e..7b28800 100644
--- a/ext/libav/gstavcodecmap.c
+++ b/ext/libav/gstavcodecmap.c
@@ -2608,6 +2608,11 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
       /* QCELP is always mono, no matter what the caps say */
       context->channels = 1;
       break;
+    case CODEC_ID_ADPCM_G726:
+      if (context->sample_rate && context->bit_rate)
+        context->bits_per_coded_sample =
+            context->bit_rate / context->sample_rate;
+      break;
     default:
       break;
   }
diff --git a/ext/libav/gstavpipe.h b/ext/libav/gstavpipe.h
index 09ec57d..5ded77f 100644
--- a/ext/libav/gstavpipe.h
+++ b/ext/libav/gstavpipe.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 } G_STMT_END
 
 #define GST_FFMPEG_PIPE_MUTEX_UNLOCK(m) G_STMT_START {                    \
-  GST_LOG_OBJECT (&m, "unlocking tlock from thread %p", g_thread_self ()); \
+  GST_LOG_OBJECT (m, "unlocking tlock from thread %p", g_thread_self ()); \
   g_mutex_unlock (&m->tlock);                                              \
 } G_STMT_END
 
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>
diff --git a/gst-libav.spec b/gst-libav.spec
index 3738d65..c8b68b0 100644
--- a/gst-libav.spec
+++ b/gst-libav.spec
@@ -4,7 +4,7 @@
 %define gst_majorminor  1.0
 
 Name: 		%{gstreamer}-libav
-Version: 	1.0.3
+Version: 	1.0.4
 Release:	1	
 Summary: 	GStreamer Streaming-media framework plug-in using libav (FFmpeg).
 Group: 		Libraries/Multimedia
diff --git a/ltmain.sh b/ltmain.sh
index 33f642a..499e473 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.1"
+VERSION="2.4.2 Debian-2.4.2-1.2"
 TIMESTAMP=""
 package_revision=1.3337
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 534d1cc..02b4bbe 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1324,7 +1324,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -1688,7 +1695,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else