[vdr-plugin-osdpip] 03/03: Updated libav fix for libav10

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-osdpip.

commit ed1959124f3673c83c8553f20d6add1ddad790ea
Author: etobi <git at e-tobi.net>
Date:   Sat Feb 14 14:47:36 2015 +0100

    Updated libav fix for libav10
---
 debian/changelog         |  1 +
 debian/patches/fix_libav | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4981a40..bedb910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ vdr-plugin-osdpip (0.1.2-8) experimental; urgency=medium
   * Standards-Version: 3.9.6
   * Build-depend on vdr-dev (>= 2.1.10)
   * Added libav fix from Alexander Grothe / yaVDR
+  * Updated libav fix for libav10
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 14 Feb 2015 14:36:28 +0100
 
diff --git a/debian/patches/fix_libav b/debian/patches/fix_libav
index 3e4c716..6b1fab5 100644
--- a/debian/patches/fix_libav
+++ b/debian/patches/fix_libav
@@ -1,5 +1,7 @@
---- a/decoder.h
-+++ b/decoder.h
+Index: vdr-plugin-osdpip/decoder.h
+===================================================================
+--- vdr-plugin-osdpip.orig/decoder.h	2015-02-14 14:45:45.863850364 +0100
++++ vdr-plugin-osdpip/decoder.h	2015-02-14 14:45:45.863850364 +0100
 @@ -34,7 +34,7 @@
    #include <libavcodec/avcodec.h>
    #ifdef USE_SWSCALE
@@ -9,8 +11,10 @@
    #endif
  #else
    #include <ffmpeg/avcodec.h>
---- a/osdpip.c
-+++ b/osdpip.c
+Index: vdr-plugin-osdpip/osdpip.c
+===================================================================
+--- vdr-plugin-osdpip.orig/osdpip.c	2015-02-14 14:45:45.863850364 +0100
++++ vdr-plugin-osdpip/osdpip.c	2015-02-14 14:45:45.863850364 +0100
 @@ -71,7 +71,7 @@
  bool cPluginOsdpip::Initialize(void)
  {
@@ -20,9 +24,18 @@
      // register all the codecs (you can also register only the codec
      // you wish to have smaller code)
      avcodec_register_all();
---- a/decoder.c
-+++ b/decoder.c
-@@ -34,8 +34,8 @@
+Index: vdr-plugin-osdpip/decoder.c
+===================================================================
+--- vdr-plugin-osdpip.orig/decoder.c	2015-02-14 14:45:45.863850364 +0100
++++ vdr-plugin-osdpip/decoder.c	2015-02-14 14:46:19.347736842 +0100
+@@ -28,14 +28,14 @@
+ 
+ int cDecoder::Open()
+ {
+-    m_Codec = avcodec_find_decoder(CODEC_ID_MPEG2VIDEO);
++    m_Codec = avcodec_find_decoder(AV_CODEC_ID_MPEG2VIDEO);
+     if (!m_Codec)
+     {
          printf("codec not found\n");
          return -1;
      }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-osdpip.git