From 6c998839275531e0424160adf221be80b8eabe76 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sat, 22 Oct 2005 09:52:40 +0000
Subject: * add FFMDIR to liboutput/Makefile, for build again ffmpeg directory

---
 Makefile           | 19 +++++++++++++++++--
 liboutput/Makefile | 12 ++++++++++--
 liboutput/encode.h |  5 +++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3df7418..b7b7ee8 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
-FFMDIR = ../../../../ffmpeg
+#FFMDIR = ../../../../ffmpeg
 
 ### Allow user defined options to overwrite defaults:
 
@@ -41,11 +41,26 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I. -I$(FFMDIR)
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I.
+ifdef FFMDIR
+INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
+endif
+
 DEFINES  += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 DEFINES  += -D_GNU_SOURCE
 LIBS += liboutput/liboutput.a libimage/libimage.a -L$(FFMDIR)/libavcodec -lavcodec -lz
 
+ifdef FFMDIR
+DEFINES += -DFFMDIR
+endif
+
+ifdef FFMDIR
+LIBS += -L$(FFMDIR)/libavcodec
+endif
+
+LIBS += -lavcodec -lz
+
+
 ### The object files (add further files here):
 
 OBJS = ${PLUGIN}.o 
diff --git a/liboutput/Makefile b/liboutput/Makefile
index 8c1a903..142e784 100644
--- a/liboutput/Makefile
+++ b/liboutput/Makefile
@@ -5,7 +5,7 @@
 
 VDRDIR = ../../../..
 DVBDIR = ../../../../../DVB
-FFMDIR = ../../../../../ffmpeg
+#FFMDIR = ../../../../../ffmpeg
 
 ### The C++ compiler and options:
 
@@ -17,9 +17,17 @@ CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
 ### The directory environment:
 
 
-INCLUDES += -I$(VDRDIR)/include -I. -I$(FFMDIR)
+INCLUDES += -I$(VDRDIR)/include -I.
+ifdef FFMDIR
+INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
+endif
+
 DEFINES  += -D_GNU_SOURCE
 
+ifdef FFMDIR
+DEFINES += -DFFMDIR
+endif
+
 ### The object files (add further files here):
 
 OBJS = encode.o stillimage.o stillimage-player.o
diff --git a/liboutput/encode.h b/liboutput/encode.h
index f19a4c4..43f69f4 100644
--- a/liboutput/encode.h
+++ b/liboutput/encode.h
@@ -25,7 +25,12 @@
 #ifndef _ENCODE_H
 #define _ENCODE_H
 
+#ifdef FFMDIR
+#include <avcodec.h>
+#else
 #include <ffmpeg/avcodec.h>
+#endif 
+
 #include "../setup-image.h"
 //#define TESTCODE
 
-- 
cgit v1.2.3