From 43ce4eb25f4fd149ad0cf28626fe05f529f9a9fc Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Thu, 12 Jan 2006 20:22:17 +0000
Subject: - fix build failed without defined FFMDIR

---
 Makefile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 3388492..93c13a3 100644
--- a/Makefile
+++ b/Makefile
@@ -72,29 +72,28 @@ VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
-### The version number of ffmpeg (taken from "libavcodec/avcodec.h" or "ffmpeg/avcodec.h" ):
+### The version number of ffmpeg (taken from "libavcodec/avcodec.h" ):
 
 ifdef FFMDIR
-FFMVERSION = $(shell grep "\#define FFMPEG_VERSION_INT " $(FFMDIR)/libavcodec/avcodec.h | \
-                    cut -d "x" -f 2 )
+LIBAVCODECVERSION = $(shell grep "\#define LIBAVCODEC_VERSION " $(FFMDIR)/libavcodec/avcodec.h | \
+                    awk '{ print $$3 }' | cut -d "." -f 1 )
 endif
 
 ### Includes and Defines (add further entries here):
 
-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
 
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I.
 
 ifdef FFMDIR
+INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
 LIBS += -L$(FFMDIR)/libavcodec
-ifneq ($(FFMVERSION),000408)
+ifeq ($(LIBAVCODECVERSION),51)
 LIBS += -L$(FFMDIR)/libavformat -L$(FFMDIR)/libavutil
+LIBS += -lavformat -lavutil
 endif
 endif
 
-- 
cgit v1.2.3