From 53454360c279844d0783b70cde023fecfc8ea69a Mon Sep 17 00:00:00 2001
From: Jochen Dolze <vdr@dolze.de>
Date: Sat, 26 Sep 2015 19:20:24 +0200
Subject: Added missing files from last commit ;)

---
 command/decoder.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'command/decoder.cpp')

diff --git a/command/decoder.cpp b/command/decoder.cpp
index cbd8055..a75f08f 100644
--- a/command/decoder.cpp
+++ b/command/decoder.cpp
@@ -102,6 +102,7 @@ fail:
 }
 #endif
 
+#if LIBAVCODEC_VERSION_INT < ((55<<16)+(18<<8)+102)
 #ifndef AV_CODEC_ID_H264
 #define AV_CODEC_ID_H264 CODEC_ID_H264
 #endif
@@ -114,6 +115,7 @@ fail:
 #ifndef AV_CODEC_ID_NONE
 #define AV_CODEC_ID_NONE CODEC_ID_NONE
 #endif
+#endif
 
 cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads)
 {
-- 
cgit v1.2.3