Imported Upstream version 1.0.1upstream/1.0.1

11 files changed, 175 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b3b1a0..3fa6108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,115 @@
+=== release 1.0.1 ===
+
+2012-10-07  Tim-Philipp Müller <tim@centricular.net>
+
+	* configure.ac:
+	  releasing 1.0.1
+
+2012-10-06 15:00:42 +0100  Tim-Philipp Müller <tim@centricular.net>
+
+	* common:
+	  Automatic update of common submodule
+	  From 6c0b52c to 6bb6951
+
+2012-09-30 16:25:29 +0100  Tim-Philipp Müller <tim@centricular.net>
+
+	* ext/libav/gstavvidenc.c:
+	  avvidenc: also skip non-video encoders
+	  Doesn't actually make any difference at the moment, but
+	  seems the right thing to do.
+	  https://bugzilla.gnome.org/show_bug.cgi?id=685113
+
+2012-09-30 01:27:10 +0200  Alban Browaeys <prahal@yahoo.com>
+
+	* ext/libav/gstavviddec.c:
+	  avviddec: exclude non-video decoders
+	  Otherwise audio decoders "ignored", ie blacklisted, end up
+	  registered by avviddec as video decoders.
+	  https://bugzilla.gnome.org/show_bug.cgi?id=685113
+
+2012-09-28 16:53:49 +0100  Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+	* ext/libav/gstavdemux.c:
+	  avdemux: fix not-negotiated errors
+	  Drop caps event received on the sink pad, instead of
+	  putting it in the list of cached events to be sent
+	  downstream later. We don't want to send our container
+	  caps downstream to our decoders, that'll give us
+	  nasty not-negotiated errors.
+	  https://bugzilla.gnome.org/show_bug.cgi?id=680464
+
+2012-09-27 12:20:30 +0200  Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+	* ext/libav/gstavviddec.c:
+	  avviddec: Correctly handle 0-sized buffers without crashing
+	  Might e.g. be valid for Theora.
+
+2012-09-25 18:29:08 +0100  Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+	* ext/libav/gstavviddec.c:
+	  avviddec: don't try to set invalid latency
+	  Avoids warnings when we don't know the latency.
+
+2012-09-24 17:01:00 +0100  Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+	* configure.ac:
+	  Back to development (bug fixing)
+
+=== release 1.0.0 ===
+
+2012-09-24 14:53:57 +0100  Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+	* NEWS:
+	* RELEASE:
+	* configure.ac:
+	* gst-libav.doap:
+	  Release 1.0.0
+
+2012-09-23 21:14:03 +0100  Tim-Philipp Müller <tim@centricular.net>
+
+	* tests/check/elements/avdec_adpcm.c:
+	* tests/check/elements/avdemux_ape.c:
+	  tests: skip broken tests
+
+2012-09-22 16:10:07 +0100  Tim-Philipp Müller <tim@centricular.net>
+
+	* common:
+	  Automatic update of common submodule
+	  From 4f962f7 to 6c0b52c
+
+=== release 0.11.99 ===
+
+2012-09-17 18:05:23 +0100  Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+	* configure.ac:
+	* gst-libav.doap:
+	  Release 0.11.99
+
+2012-09-17 17:53:29 +0100  Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+	* configure.ac:
+	* tests/check/Makefile.am:
+	  Remove -DGST_USE_UNSTABLE_API
+
+2012-09-14 13:24:37 +0200  Wim Taymans <wim.taymans@collabora.co.uk>
+
+	* ext/libav/gstavviddec.c:
+	  avviddec: improve debug
+
+2012-09-14 02:59:37 +0100  Tim-Philipp Müller <tim@centricular.net>
+
+	* configure.ac:
+	  Back to development
+
+=== release 0.11.94 ===
+
+2012-09-14 02:51:13 +0100  Tim-Philipp Müller <tim@centricular.net>
+
+	* ChangeLog:
+	* configure.ac:
+	* gst-libav.doap:
+	  Release 0.11.94
+
 2012-09-13 09:36:14 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
 
 	* ext/libav/gstavviddec.c:
diff --git a/NEWS b/NEWS
index 304112b..617d893 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,15 @@
-This is GStreamer Libav Plugins 1.0.0
+This is GStreamer Libav Plugins 1.0.1
+
+Changes since 1.0.0:
+
+      * avviddec: handle 0-sized buffers without crashing
+      * avviddec: don't set invalid latency
+
+Bugs fixed since 1.0.0:
+     
+      * 680464 : avdemux_*: not-negotiated error
+      * 680499 : avdemux_ape: will not play some ape files, not-negotiated error
+      * 685113 : avviddec: ignored audio decoders end up registered as video decoders
 
 New features in 1.0.0:
 
diff --git a/common/m4/gst-feature.m4 b/common/m4/gst-feature.m4
index 6da0940..876215e 100644
--- a/common/m4/gst-feature.m4
+++ b/common/m4/gst-feature.m4
@@ -209,7 +209,7 @@ AC_DEFUN([AG_GST_PARSE_SUBSYSTEM_DISABLE],
 
 dnl Parse gstconfig.h and defines add the symbols and substitions
 dnl
-dnl GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig.h"
+dnl GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-1.0`"/gst/gstconfig.h"
 dnl AG_GST_PARSE_SUBSYSTEM_DISABLES(GST_CONFIGPATH)
 dnl
 AC_DEFUN([AG_GST_PARSE_SUBSYSTEM_DISABLES],
diff --git a/common/upload-doc.mak b/common/upload-doc.mak
index 3bf9496..c1c4945 100644
--- a/common/upload-doc.mak
+++ b/common/upload-doc.mak
@@ -44,14 +44,12 @@ upload: $(FORMATS)
 	if echo $(FORMATS) | grep ps > /dev/null; then export SRC="$$SRC $(DOC).ps"; fi; \
 	if echo $(FORMATS) | grep pdf > /dev/null; then export SRC="$$SRC $(DOC).pdf"; fi; \
 	\
-	# upload releases to both 0.10.X/ and head/ subdirectories \
-	if test "x$(PACKAGE_VERSION_NANO)" = x0; then \
-	  export DIR=$(DOC_BASE)/gstreamer/$(VERSION)/$(DOC); \
-	  echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \
-	  ssh $(DOC_SERVER) mkdir -p $$DIR; \
-	  rsync -rv -e ssh --delete $$SRC $(DOC_SERVER):$$DIR; \
-	  ssh $(DOC_SERVER) chmod -R g+w $$DIR; \
-	fi; \
+	# upload releases to both X.Y/ and head/ subdirectories \
+	export DIR=$(DOC_BASE)/gstreamer/$(PACKAGE_VERSION_MAJOR).$(PACKAGE_VERSION_MINOR)/$(DOC); \
+	echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \
+	ssh $(DOC_SERVER) mkdir -p $$DIR; \
+	rsync -rv -e ssh --delete $$SRC $(DOC_SERVER):$$DIR; \
+	ssh $(DOC_SERVER) chmod -R g+w $$DIR; \
 	\
 	export DIR=$(DOC_BASE)/gstreamer/head/$(DOC); \
 	echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \
diff --git a/configure b/configure
index 850c156..89c2ffc 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.0.
+# Generated by GNU Autoconf 2.69 for GStreamer libav 1.0.1.
 #
 # 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.0'
-PACKAGE_STRING='GStreamer libav 1.0.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='GStreamer libav 1.0.1'
 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.0 to adapt to many kinds of systems.
+\`configure' configures GStreamer libav 1.0.1 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.0:";;
+     short | recursive ) echo "Configuration of GStreamer libav 1.0.1:";;
    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.0
+GStreamer libav configure 1.0.1
 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.0, which was
+It was created by GStreamer libav $as_me 1.0.1, 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.0'
+ VERSION='1.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3206,9 +3206,9 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
-  PACKAGE_VERSION_MAJOR=$(echo 1.0.0 | cut -d'.' -f1)
-  PACKAGE_VERSION_MINOR=$(echo 1.0.0 | cut -d'.' -f2)
-  PACKAGE_VERSION_MICRO=$(echo 1.0.0 | cut -d'.' -f3)
+  PACKAGE_VERSION_MAJOR=$(echo 1.0.1 | cut -d'.' -f1)
+  PACKAGE_VERSION_MINOR=$(echo 1.0.1 | cut -d'.' -f2)
+  PACKAGE_VERSION_MICRO=$(echo 1.0.1 | 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.0 | cut -d'.' -f4)
+  NANO=$(echo 1.0.1 | cut -d'.' -f4)
 
   if test x"$NANO" = x || test "x$NANO" = "x0" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5
@@ -7798,10 +7798,10 @@ fi
 done
 
 
-  GST_CURRENT=0
+  GST_CURRENT=1
   GST_REVISION=0
-  GST_AGE=0
-  GST_LIBVERSION=0:0:0
+  GST_AGE=1
+  GST_LIBVERSION=1:0:1
 
 
 
@@ -17802,7 +17802,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.0, which was
+This file was extended by GStreamer libav $as_me 1.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17868,7 +17868,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.0
+GStreamer libav config.status 1.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 87d63d5..a342361 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.0,
+AC_INIT(GStreamer libav, 1.0.1,
     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, 0, 0, 0)
+AS_LIBTOOL(GST, 1, 0, 1)
 
 dnl *** required versions of GStreamer stuff ***
 GST_REQ=1.0.0
diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c
index bbe5d8e..bee67a5 100644
--- a/ext/libav/gstavdemux.c
+++ b/ext/libav/gstavdemux.c
@@ -1000,6 +1000,7 @@ gst_ffmpegdemux_get_stream (GstFFMpegDemux * demux, AVStream * avstream)
   gst_pad_push_event (pad, gst_event_new_stream_start (stream_id));
   g_free (stream_id);
 
+  GST_INFO_OBJECT (pad, "adding pad with caps %" GST_PTR_FORMAT, caps);
   gst_pad_set_caps (pad, caps);
   gst_caps_unref (caps);
 
@@ -1603,6 +1604,11 @@ gst_ffmpegdemux_sink_event (GstPad * sinkpad, GstObject * parent,
       /* eat this event for now, task will send eos when finished */
       gst_event_unref (event);
       goto done;
+    case GST_EVENT_STREAM_START:
+    case GST_EVENT_CAPS:
+      GST_LOG_OBJECT (demux, "dropping %s event", GST_EVENT_TYPE_NAME (event));
+      gst_event_unref (event);
+      goto done;
     default:
       /* for a serialized event, wait until an earlier data is gone,
        * though this is no guarantee as to when task is done with it.
diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
index c382832..669a75d 100644
--- a/ext/libav/gstavviddec.c
+++ b/ext/libav/gstavviddec.c
@@ -502,7 +502,8 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
 done:
   GST_OBJECT_UNLOCK (ffmpegdec);
 
-  gst_video_decoder_set_latency (decoder, latency, latency);
+  if (GST_CLOCK_TIME_IS_VALID (latency))
+    gst_video_decoder_set_latency (decoder, latency, latency);
 
   return ret;
 
@@ -1339,8 +1340,8 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
   bdata = minfo.data;
   bsize = minfo.size;
 
-  if (!GST_MEMORY_IS_ZERO_PADDED (minfo.memory)
-      || (minfo.maxsize - minfo.size) < FF_INPUT_BUFFER_PADDING_SIZE) {
+  if (bsize > 0 && (!GST_MEMORY_IS_ZERO_PADDED (minfo.memory)
+          || (minfo.maxsize - minfo.size) < FF_INPUT_BUFFER_PADDING_SIZE)) {
     /* add padding */
     if (ffmpegdec->padded_size < bsize + FF_INPUT_BUFFER_PADDING_SIZE) {
       ffmpegdec->padded_size = bsize + FF_INPUT_BUFFER_PADDING_SIZE;
@@ -1689,10 +1690,9 @@ gst_ffmpegviddec_register (GstPlugin * plugin)
     gchar *type_name;
     gchar *plugin_name;
 
-    /* only decoders */
-    if (!in_plugin->decode) {
+    /* only video decoders */
+    if (!in_plugin->decode || in_plugin->type != AVMEDIA_TYPE_VIDEO)
       goto next;
-    }
 
     /* no quasi-codecs, please */
     if (in_plugin->id == CODEC_ID_RAWVIDEO ||
diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
index 2ef4acb..b747613 100644
--- a/ext/libav/gstavvidenc.c
+++ b/ext/libav/gstavvidenc.c
@@ -970,10 +970,9 @@ gst_ffmpegvidenc_register (GstPlugin * plugin)
       goto next;
     }
 
-    /* only encoders */
-    if (!in_plugin->encode) {
+    /* only video encoders */
+    if (!in_plugin->encode || in_plugin->type != AVMEDIA_TYPE_VIDEO)
       goto next;
-    }
 
     /* FIXME : We should have a method to know cheaply whether we have a mapping
      * for the given plugin or not */
diff --git a/gst-libav.doap b/gst-libav.doap
index 9ab83be..8fd51a1 100644
--- a/gst-libav.doap
+++ b/gst-libav.doap
@@ -34,6 +34,16 @@ colorspace conversion elements.
 
  <release>
   <Version>
+   <revision>1.0.1</revision>
+   <branch>1.0</branch>
+   <name></name>
+   <created>2012-10-07</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.0.1.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
    <revision>1.0.0</revision>
    <branch>1.0</branch>
    <name></name>
diff --git a/gst-libav.spec b/gst-libav.spec
index 3c785a3..a16ea70 100644
--- a/gst-libav.spec
+++ b/gst-libav.spec
@@ -4,7 +4,7 @@
 %define gst_majorminor  1.0
 
 Name: 		%{gstreamer}-libav
-Version: 	1.0.0
+Version: 	1.0.1
 Release:	1	
 Summary: 	GStreamer Streaming-media framework plug-in using libav (FFmpeg).
 Group: 		Libraries/Multimedia