[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=b51cbb8

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

    * Add upstream patch 03-encoding-libavformatv56 to fix some more encoding
      errors with libavformat v56.
---
 debian/changelog                               |  2 ++
 debian/patches/03-encoding-libavformatv56.diff | 30 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8f0f6d8..a411b4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mlt (0.9.2-2) UNRELEASED; urgency=medium
   * Add upstream patch 02-audio-rendering-libav0.11 to fix audio rendering with
     libav 0.11.
     Closes: #761593
+  * Add upstream patch 03-encoding-libavformatv56 to fix some more encoding
+    errors with libavformat v56.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 24 Sep 2014 19:00:33 +0200
 
diff --git a/debian/patches/03-encoding-libavformatv56.diff b/debian/patches/03-encoding-libavformatv56.diff
new file mode 100644
index 0000000..8ad4770
--- /dev/null
+++ b/debian/patches/03-encoding-libavformatv56.diff
@@ -0,0 +1,30 @@
+# Upstream patch to fix some more encoding errors with libavformat v56.
+# URL: https://github.com/mltframework/mlt/commit/e8c0fb4531cb4de142cebd7a39ee7863b76e7e03
+
+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 18:52:22.258010988 +0200
++++ mlt-0.9.2/src/modules/avformat/consumer_avformat.c	2014-09-24 18:53:46.878008587 +0200
+@@ -1801,7 +1801,11 @@
+ 
+ 						if ( i == 0 )
+ 						{
++#if LIBAVFORMAT_VERSION_MAJOR >= 56
++							audio_pts = (double) sample_count[0] * av_q2d( stream->codec->time_base );
++#else
+ 							audio_pts = (double) sample_count[0] * av_q2d( stream->time_base );
++#endif
+ 						}
+ 					}
+ 				}
+@@ -1991,7 +1995,11 @@
+ 						}
+  					}
+ 					frame_count++;
++#if LIBAVFORMAT_VERSION_MAJOR >= 56
++					video_pts = (double) frame_count * av_q2d( video_st->codec->time_base );
++#else
+ 					video_pts = (double) frame_count * av_q2d( video_st->time_base );
++#endif
+ 					if ( ret )
+ 					{
+ 						mlt_log_fatal( MLT_CONSUMER_SERVICE( consumer ), "error writing video frame
" );
diff --git a/debian/patches/series b/debian/patches/series
index 4d3ec5c..033ccd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-changed-preset-path.diff
 02-audio-rendering-libav0.11.diff
+03-encoding-libavformatv56.diff

-- 
MLT multimedia framework packaging