[SCM] KDE Multimedia module packaging branch, master, updated. debian/4.6.5-2-2-ga9ba346

[Pino Toscano]

The following commit has been merged in the master branch:
commit a9ba3465959d2bc396ea62f17e8dd8d0b3182cc5
Author: Pino Toscano <pino at debian.org>
Date:   Sat Sep 3 16:43:59 2011 +0200

    make ffmpegthumbnailer compile with libav >= 0.7 (#638241)
    
    add patch libav_compat.diff
---
 debian/changelog                 |    3 +++
 debian/patches/libav_compat.diff |   22 ++++++++++++++++++++++
 debian/patches/series            |    1 +
 3 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d390f1..1b1d095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdemultimedia (4:4.6.5-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Make ffmpegthumbnailer compile with libav >= 0.7 (patch libav_compat.diff).
+    (Closes: #638241)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Sep 2011 16:36:28 +0200
 
diff --git a/debian/patches/libav_compat.diff b/debian/patches/libav_compat.diff
new file mode 100644
index 0000000..2dd16a4
--- /dev/null
+++ b/debian/patches/libav_compat.diff
@@ -0,0 +1,22 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix compilation with libav >= 0.7
+ Use CODEC_TYPE_VIDEO or AVMEDIA_TYPE_AUDIO depending on the version of
+ libavcodec.
+Last-Update: 2011-09-03
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638241
+
+--- a/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp
++++ b/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp
+@@ -122,7 +122,11 @@
+ void MovieDecoder::initializeVideo()
+ {
+     for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) {
++#if LIBAVCODEC_VERSION_MAJOR < 53
+         if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) {
++#else
++        if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
++#endif
+             m_pVideoStream = m_pFormatContext->streams[i];
+             m_VideoStream = i;
+             break;
diff --git a/debian/patches/series b/debian/patches/series
index 58ab0e5..43d6741 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kmix_showeverywhere.diff
 fix_target_link_libraries.diff
 kmix_memleak_pulse.diff
+libav_compat.diff

-- 
KDE Multimedia module packaging