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

---
 liboutput/Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'liboutput/Makefile')

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
-- 
cgit v1.2.3