Imported Upstream version 0.11.99upstream/0.11.99

7 files changed, 40 insertions, 29 deletions

diff --git a/configure b/configure
index 2ed50ae..0e1071d 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 0.11.94.
+# Generated by GNU Autoconf 2.69 for GStreamer libav 0.11.99.
 #
 # 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='0.11.94'
-PACKAGE_STRING='GStreamer libav 0.11.94'
+PACKAGE_VERSION='0.11.99'
+PACKAGE_STRING='GStreamer libav 0.11.99'
 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 0.11.94 to adapt to many kinds of systems.
+\`configure' configures GStreamer libav 0.11.99 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 0.11.94:";;
+     short | recursive ) echo "Configuration of GStreamer libav 0.11.99:";;
    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 0.11.94
+GStreamer libav configure 0.11.99
 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 0.11.94, which was
+It was created by GStreamer libav $as_me 0.11.99, 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='0.11.94'
+ VERSION='0.11.99'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3206,9 +3206,9 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
-  PACKAGE_VERSION_MAJOR=$(echo 0.11.94 | cut -d'.' -f1)
-  PACKAGE_VERSION_MINOR=$(echo 0.11.94 | cut -d'.' -f2)
-  PACKAGE_VERSION_MICRO=$(echo 0.11.94 | cut -d'.' -f3)
+  PACKAGE_VERSION_MAJOR=$(echo 0.11.99 | cut -d'.' -f1)
+  PACKAGE_VERSION_MINOR=$(echo 0.11.99 | cut -d'.' -f2)
+  PACKAGE_VERSION_MICRO=$(echo 0.11.99 | 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 0.11.94 | cut -d'.' -f4)
+  NANO=$(echo 0.11.99 | cut -d'.' -f4)
 
   if test x"$NANO" = x || test "x$NANO" = "x0" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5
@@ -12126,7 +12126,7 @@ CC="$lt_save_CC"
 
 
 
-GST_REQ=0.11.94
+GST_REQ=0.11.99
 
 ORC_REQ=0.4.16
 
@@ -16641,7 +16641,7 @@ GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFI
 
 
 
-GST_CFLAGS="$GST_CFLAGS -DGST_USE_UNSTABLE_API"
+GST_CFLAGS="$GST_CFLAGS"
 GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)"
 
 
@@ -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 0.11.94, which was
+This file was extended by GStreamer libav $as_me 0.11.99, 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 0.11.94
+GStreamer libav config.status 0.11.99
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 963d9d6..a49edae 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, 0.11.94,
+AC_INIT(GStreamer libav, 0.11.99,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-libav)
 
@@ -45,7 +45,7 @@ AG_GST_LIBTOOL_PREPARE
 AS_LIBTOOL(GST, 0, 0, 0)
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.11.94
+GST_REQ=0.11.99
 
 ORC_REQ=0.4.16
 ORC_CHECK([$ORC_REQ])
@@ -172,7 +172,7 @@ dnl FIXME: do we want to rename to GST_ALL_* ?
 dnl prefer internal headers to already installed ones
 dnl also add builddir include for enumtypes and marshal
 dnl add GST_OPTION_CFLAGS, but overridable
-GST_CFLAGS="$GST_CFLAGS -DGST_USE_UNSTABLE_API"
+GST_CFLAGS="$GST_CFLAGS"
 GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)"
 AC_SUBST(GST_CFLAGS)
 AC_SUBST(GST_LIBS)
diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
index 588d2b2..c382832 100644
--- a/ext/libav/gstavviddec.c
+++ b/ext/libav/gstavviddec.c
@@ -574,6 +574,8 @@ gst_ffmpegviddec_get_buffer (AVCodecContext * context, AVFrame * picture)
   /* GstFFMpegVidDecVideoFrame receives the frame ref */
   picture->opaque = dframe = gst_ffmpegviddec_video_frame_new (frame);
 
+  GST_DEBUG_OBJECT (ffmpegdec, "storing opaque %p", dframe);
+
   ffmpegdec->context->pix_fmt = context->pix_fmt;
 
   /* see if we need renegotiation */
@@ -1323,9 +1325,10 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
   gboolean do_padding;
 
   GST_LOG_OBJECT (ffmpegdec,
-      "Received new data of size %u, pts:%"
+      "Received new data of size %u, dts %" GST_TIME_FORMAT ", pts:%"
       GST_TIME_FORMAT ", dur:%" GST_TIME_FORMAT,
       gst_buffer_get_size (frame->input_buffer),
+      GST_TIME_ARGS (frame->dts),
       GST_TIME_ARGS (frame->pts), GST_TIME_ARGS (frame->duration));
 
   if (!gst_buffer_map (frame->input_buffer, &minfo, GST_MAP_READ)) {
@@ -1523,8 +1526,8 @@ gst_ffmpegviddec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
     avcodec_align_dimensions2 (ffmpegdec->context, &width, &height,
         linesize_align);
     edge =
-        ffmpegdec->
-        context->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width ();
+        ffmpegdec->context->
+        flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width ();
     /* increase the size for the padding */
     width += edge << 1;
     height += edge << 1;
diff --git a/gst-libav.doap b/gst-libav.doap
index 5098d3f..64039aa 100644
--- a/gst-libav.doap
+++ b/gst-libav.doap
@@ -27,13 +27,23 @@ colorspace conversion elements.
 
  <repository>
    <GitRepository>
-     <location rdf:resource="git://anongit.freedesktop.org/gstreamer/gst-ffmpeg"/>
-     <browse rdf:resource="http://cgit.freedesktop.org/gstreamer/gst-ffmpeg"/>
+     <location rdf:resource="git://anongit.freedesktop.org/gstreamer/gst-libav"/>
+     <browse rdf:resource="http://cgit.freedesktop.org/gstreamer/gst-libav"/>
    </GitRepository>
  </repository> 
 
  <release>
   <Version>
+   <revision>0.11.99</revision>
+   <branch>0.11</branch>
+   <name>Have Some Courtesy</name>
+   <created>2012-09-17</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-0.11.99.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
    <revision>0.11.94</revision>
    <branch>0.11</branch>
    <name>To Each His Own Symphony</name>
diff --git a/gst-libav.spec b/gst-libav.spec
index 43eea66..d9cb6e9 100644
--- a/gst-libav.spec
+++ b/gst-libav.spec
@@ -4,7 +4,7 @@
 %define gst_majorminor  1.0
 
 Name: 		%{gstreamer}-libav
-Version: 	0.11.94
+Version: 	0.11.99
 Release:	1	
 Summary: 	GStreamer Streaming-media framework plug-in using libav (FFmpeg).
 Group: 		Libraries/Multimedia
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 4af5db3..67fb318 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -33,8 +33,7 @@ TESTS = $(check_PROGRAMS)
 noinst_PROGRAMS =
 
 AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) \
-	$(GST_OPTION_CFLAGS) -DGST_TEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\"" \
-	-DGST_USE_UNSTABLE_API
+	$(GST_OPTION_CFLAGS) -DGST_TEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\""
 
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 
diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in
index 7a77fe4..c70e7a7 100644
--- a/tests/check/Makefile.in
+++ b/tests/check/Makefile.in
@@ -382,8 +382,7 @@ VALGRIND_TO_FIX = \
 
 TESTS = $(check_PROGRAMS)
 AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) \
-	$(GST_OPTION_CFLAGS) -DGST_TEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\"" \
-	-DGST_USE_UNSTABLE_API
+	$(GST_OPTION_CFLAGS) -DGST_TEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\""
 
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)