From 47b4dc48fc08fdfc91ec43aead2fb40a184c309c Mon Sep 17 00:00:00 2001 From: schmirl Date: Mon, 6 Jul 2009 06:23:36 +0000 Subject: [PATCH] removed redefinitions in includes - caused problems in older compilers --- HISTORY | 1 + remux/tsremux.h | 3 --- server/livestreamer.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/HISTORY b/HISTORY index 99636e8..ddbbd31 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,7 @@ VDR Plugin 'streamdev' Revision History --------------------------------------- +- removed redefinitions in includes - caused problems in older compilers - fixed ts2ps.h defines - fixed missing virtual for cTS2PESRemux destructor - silenced format mismatch warning on 64bit OS diff --git a/remux/tsremux.h b/remux/tsremux.h index dbcb9ff..dbcd5de 100644 --- a/remux/tsremux.h +++ b/remux/tsremux.h @@ -6,9 +6,6 @@ // Picture types: #define NO_PICTURE 0 -#define I_FRAME 1 -#define P_FRAME 2 -#define B_FRAME 3 namespace Streamdev { diff --git a/server/livestreamer.h b/server/livestreamer.h index 7f442ba..92448bb 100644 --- a/server/livestreamer.h +++ b/server/livestreamer.h @@ -5,7 +5,6 @@ #include #include "server/streamer.h" -#include "remux/tsremux.h" #include "common.h" namespace Streamdev {