From 23c1e169dcbc112e114d03fbac9f60ddbff68856 Mon Sep 17 00:00:00 2001
From: Jochen Dolze <vdr@dolze.de>
Date: Mon, 6 Feb 2012 19:08:48 +0100
Subject: Added patch from etobi which closes bug #872

---
 command/decoder.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'command/decoder.cpp')

diff --git a/command/decoder.cpp b/command/decoder.cpp
index 29a1483..3890e15 100644
--- a/command/decoder.cpp
+++ b/command/decoder.cpp
@@ -22,20 +22,12 @@
 
 #include "decoder.h"
 
-#ifndef AVMEDIA_TYPE_AUDIO
+#if LIBAVUTIL_VERSION_INT < ((50<<16)+(14<<8)+0)
 #define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
-#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)
 {
-- 
cgit v1.2.3