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

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

    - Remove upstream patch 03-encoding-libavformatv56.
---
 debian/changelog                               |  1 +
 debian/patches/03-encoding-libavformatv56.diff | 30 --------------------------
 debian/patches/series                          |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d9c81c..5e2fde1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,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.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 08 Oct 2014 15:47:22 +0200
 
diff --git a/debian/patches/03-encoding-libavformatv56.diff b/debian/patches/03-encoding-libavformatv56.diff
deleted file mode 100644
index 8ad4770..0000000
--- a/debian/patches/03-encoding-libavformatv56.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 75a74c9..b3f51cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-changed-preset-path.diff
-03-encoding-libavformatv56.diff
 04-deprecation-avstream.codec.time_base-muxer.diff

-- 
MLT multimedia framework packaging