From 5a943a50615ff9ed9ce365f162e129b49ab20f62 Mon Sep 17 00:00:00 2001
From: Juergen Lock <nox@FreeBSD.org>
Date: Sat, 16 Nov 2013 11:50:04 +0000
Subject: [PATCH] Chase ffmpeg update.

Obtained from:	funtoo (files/patch-vdr-markad-0.1.4-libav9)
---
 .../files/patch-command-decoder.cpp-ffmpeg1   | 11 +++++
 .../files/patch-vdr-markad-0.1.4-libav9       | 40 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1
 create mode 100644 multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9

diff --git a/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1 b/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1
new file mode 100644
index 000000000000..22203237a4cd
--- /dev/null
+++ b/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1
@@ -0,0 +1,11 @@
+--- a/command/decoder.cpp
++++ b/command/decoder.cpp
+@@ -164,7 +164,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH
+     }
+ 
+     video_codec=NULL;
+-    CodecID video_codecid;
++    AVCodecID video_codecid;
+ 
+     if (useH264)
+     {
diff --git a/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 b/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9
new file mode 100644
index 000000000000..fca9cbb49e35
--- /dev/null
+++ b/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9
@@ -0,0 +1,40 @@
+diff -urN markad-0.1.4.old/command/decoder.cpp markad-0.1.4/command/decoder.cpp
+--- markad-0.1.4.old/command/decoder.cpp	2013-06-17 21:52:44.333367552 +0200
++++ markad-0.1.4/command/decoder.cpp	2013-06-17 21:53:03.708366863 +0200
+@@ -11,6 +11,7 @@
+ #include <sys/types.h>
+ #include <string.h>
+ #include <cstdlib>
++#include <stdio.h>
+ 
+ #include "decoder.h"
+ 
+@@ -172,7 +173,7 @@
+ 
+     if (video_codec)
+     {
+-        video_context = avcodec_alloc_context();
++        video_context = avcodec_alloc_context3(NULL);
+         if (video_context)
+         {
+             if (video_codec->capabilities & CODEC_CAP_TRUNCATED)
+@@ -321,7 +322,7 @@
+     {
+         avcodec_flush_buffers(video_context);
+         AVCodecContext *dest;
+-        dest=avcodec_alloc_context();
++        dest=avcodec_alloc_context3(NULL);
+         if (dest)
+         {
+             if (avcodec_copy_context(dest,video_context)!=0) ret=false;
+diff -urN markad-0.1.4.old/command/decoder.h markad-0.1.4/command/decoder.h
+--- markad-0.1.4.old/command/decoder.h	2013-06-17 21:52:44.333367552 +0200
++++ markad-0.1.4/command/decoder.h	2013-06-17 21:53:03.708366863 +0200
+@@ -18,6 +18,7 @@
+ #include <avcodec.h>
+ #else
+ #include <libavcodec/avcodec.h>
++#include <libavutil/mem.h>
+ #endif
+ 
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)