[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.9.2-2-6-g0764f1f

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit 5228092c385e720c8999c54d0eaae87462100dc8
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Oct 8 15:51:00 2014 +0200

    - Remove upstream patch 04-deprecation-avstream.codec.time_base-muxer.
---
 debian/changelog                                   |  1 +
 ...deprecation-avstream.codec.time_base-muxer.diff | 31 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e2fde1..6b7f1fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mlt (0.9.2+git20141008-1) UNRELEASED; urgency=low
   * New upstream git snapshot.
     - Remove upstream patch 02-audio-rendering-libav0.11.
     - Remove upstream patch 03-encoding-libavformatv56.
+    - Remove upstream patch 04-deprecation-avstream.codec.time_base-muxer.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 08 Oct 2014 15:47:22 +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
deleted file mode 100644
index 10b635a..0000000
--- a/debian/patches/04-deprecation-avstream.codec.time_base-muxer.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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 b3f51cb..abc7af8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-changed-preset-path.diff
-04-deprecation-avstream.codec.time_base-muxer.diff

-- 
MLT multimedia framework packaging