[SCM] vdr-plugin-markad packaging repository branch, master, updated. debian/0.1.3-1-3-g88f8b44

etobi git at e-tobi.net
Wed Mar 6 21:40:42 UTC 2013


The following commit has been merged in the master branch:
commit 169bb297312529e1a60a306a98e08788420ba427
Author: etobi <git at e-tobi.net>
Date:   Sun May 6 10:44:05 2012 +0200

    Dropped patch, fixed upstream

diff --git a/debian/patches/libavutil-fix.patch b/debian/patches/libavutil-fix.patch
deleted file mode 100644
index 4f861d1..0000000
--- a/debian/patches/libavutil-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 5ad9fbc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-libavutil-fix.patch

-- 
vdr-plugin-markad packaging repository



More information about the pkg-vdr-dvb-changes mailing list