[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.9.2-1-4-g876bce2

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=8ea290b

The following commit has been merged in the master branch:
commit 8ea290b7b034d9d03772b6cc98f05e4f3d9b69b9
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Sep 24 19:16:01 2014 +0200

    * Add upstream patch 04-deprecation-avstream.codec.time_base-muxer to fix a
      deprecation warning.
      Closes: #760773
---
 debian/changelog                                   |  3 +++
 ...deprecation-avstream.codec.time_base-muxer.diff | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a411b4d..36ec3a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ mlt (0.9.2-2) UNRELEASED; urgency=medium
     Closes: #761593
   * Add upstream patch 03-encoding-libavformatv56 to fix some more encoding
     errors with libavformat v56.
+  * Add upstream patch 04-deprecation-avstream.codec.time_base-muxer to fix a
+    deprecation warning.
+    Closes: #760773
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 24 Sep 2014 19:00:33 +0200
 
diff --git a/debian/patches/04-deprecation-avstream.codec.time_base-muxer.diff b/debian/patches/04-deprecation-avstream.codec.time_base-muxer.diff
new file mode 100644
index 0000000..10b635a
--- /dev/null
+++ b/debian/patches/04-deprecation-avstream.codec.time_base-muxer.diff
@@ -0,0 +1,31 @@
+# Upstream patch to fix a deprecation warning using AVStream.codec.time_base as muxer hint.
+# URL: https://github.com/mltframework/mlt/commit/24a26b0099600a2b3cedfd1c627bf5d48379fdbc
+# Closes: #760773
+
+diff -Naur mlt-0.9.2.orig/src/modules/avformat/consumer_avformat.c mlt-0.9.2/src/modules/avformat/consumer_avformat.c
+--- mlt-0.9.2.orig/src/modules/avformat/consumer_avformat.c	2014-09-24 19:04:25.073991603 +0200
++++ mlt-0.9.2/src/modules/avformat/consumer_avformat.c	2014-09-24 19:10:32.481981907 +0200
+@@ -637,7 +637,11 @@
+ 
+ 		// Set parameters controlled by MLT
+ 		c->sample_rate = mlt_properties_get_int( properties, "frequency" );
++#if LIBAVFORMAT_VERSION_INT >= ((55<<16)+(44<<8)+0)
++		st->time_base = ( AVRational ){ 1, c->sample_rate };
++#else
+ 		c->time_base = ( AVRational ){ 1, c->sample_rate };
++#endif
+ 		c->channels = channels;
+ 
+ 		if ( mlt_properties_get( properties, "alang" ) != NULL )
+@@ -837,8 +841,10 @@
+ 		c->height = mlt_properties_get_int( properties, "height" );
+ 		c->time_base.num = mlt_properties_get_int( properties, "frame_rate_den" );
+ 		c->time_base.den = mlt_properties_get_int( properties, "frame_rate_num" );
++#if LIBAVFORMAT_VERSION_INT < ((55<<16)+(44<<8)+0)
+ 		if ( st->time_base.den == 0 )
+-			st->time_base = c->time_base;
++#endif
++		st->time_base = c->time_base;
+ 		c->pix_fmt = pix_fmt ? av_get_pix_fmt( pix_fmt ) : PIX_FMT_YUV420P;
+ 		
+ 		switch ( colorspace )
diff --git a/debian/patches/series b/debian/patches/series
index 033ccd0..882fdb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-changed-preset-path.diff
 02-audio-rendering-libav0.11.diff
 03-encoding-libavformatv56.diff
+04-deprecation-avstream.codec.time_base-muxer.diff

-- 
MLT multimedia framework packaging