summaryrefslogtreecommitdiff
path: root/command/decoder.cpp
diff options
context:
space:
mode:
authorJochen Dolze <vdr@dolze.de>2012-02-06 19:08:48 +0100
committerJochen Dolze <vdr@dolze.de>2012-02-06 19:08:48 +0100
commit23c1e169dcbc112e114d03fbac9f60ddbff68856 (patch)
tree2b5da3d0a434d4e933b5520abe9330d5e0b8f1b7 /command/decoder.cpp
parent2ea9f6a076666fb6128c60872a4803cdda6a4a2f (diff)
downloadvdr-plugin-markad-23c1e169dcbc112e114d03fbac9f60ddbff68856.tar.gz
vdr-plugin-markad-23c1e169dcbc112e114d03fbac9f60ddbff68856.tar.bz2
Added patch from etobi which closes bug #872
Diffstat (limited to 'command/decoder.cpp')
-rw-r--r--command/decoder.cpp10
1 files changed, 1 insertions, 9 deletions
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)
{