[SCM] KDE Multimedia module packaging branch, master, updated. debian/4.6.5-3-6-gbd4124d

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit a3fd9e67e97fe3ebdd670d6b18c93366f978b144
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sun Sep 25 10:29:12 2011 +0100

    Update libav_compat.diff
---
 debian/changelog                 |    1 +
 debian/patches/libav_compat.diff |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12ac82f..670938a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kdemultimedia (4:4.7.1-0r0) UNRELEASED; urgency=low
   * Bump kde-sc-dev-latest build dependency to 4:4.7.1.
   * Bump kdelibs5-dev build dependency to 4:4.7
   * Removed kmix_memleak_pulse.diff (upstream)
+  * Update libav_compat.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 25 Sep 2011 09:50:44 +0100
 
diff --git a/debian/patches/libav_compat.diff b/debian/patches/libav_compat.diff
index 453fd90..b56caec 100644
--- a/debian/patches/libav_compat.diff
+++ b/debian/patches/libav_compat.diff
@@ -13,9 +13,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638241
  {
      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) {
++        if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) {
 +#else
-+        if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+         if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 +#endif
              m_pVideoStream = m_pFormatContext->streams[i];
              m_VideoStream = i;

-- 
KDE Multimedia module packaging