[SCM] vdr-plugin-markad packaging repository branch, master, updated. debian/0.1.2-2-7-g21d9fe5

[etobi]

The following commit has been merged in the master branch:
commit 21d9fe5378923af928f94e972f1bd7d29d448bfe
Author: etobi <git at e-tobi.net>
Date:   Sat Feb 4 21:14:58 2012 +0100

    Fixed an upstream (http://projects.vdr-developer.org/issues/872)

diff --git a/debian/changelog b/debian/changelog
index 0b148a8..41829ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 vdr-plugin-markad (0.1.2+git20120131-1) experimental; urgency=low
 
   * New Upstream Snapshot
+  * Fixed an upstream (http://projects.vdr-developer.org/issues/872)
 
  -- Tobias Grimm <etobi at debian.org>  Tue, 31 Jan 2012 12:26:46 +0100
 
diff --git a/debian/patches/libavutil-fix.patch b/debian/patches/libavutil-fix.patch
new file mode 100644
index 0000000..4f861d1
--- /dev/null
+++ b/debian/patches/libavutil-fix.patch
@@ -0,0 +1,36 @@
+Description: Fix the libvautil version handling
+Author: Tobias Grimm <etobi at debian.org>
+Bug: http://projects.vdr-developer.org/issues/872
+
+diff --git a/command/decoder.cpp b/command/decoder.cpp
+index 29a1483..c88776c 100644
+--- a/command/decoder.cpp
++++ b/command/decoder.cpp
+@@ -22,20 +22,12 @@
+ 
+ #include "decoder.h"
+ 
+-#ifndef AVMEDIA_TYPE_AUDIO
+-#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 14, 0)
++  #define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
++  #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
++  #define AVMEDIA_TYPE_UNKNOWN CODEC_TYPE_UNKNOWN
+ #endif
+ 
+-#ifndef AVMEDIA_TYPE_VIDEO
+-#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
+-#endif
+-
+-#ifndef AVMEDIA_TYPE_UNKNOWN
+-#define AVMEDIA_TYPE_UNKNOWN CODEC_TYPE_UNKNOWN
+-#endif
+-
+-#include "decoder.h"
+-
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(65<<8)+0)
+ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
+ {
+-- 
+1.7.8.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5ad9fbc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libavutil-fix.patch

-- 
vdr-plugin-markad packaging repository