From 64fe6b70d0a5b34a80ff458fbf1664018d5c0182 Mon Sep 17 00:00:00 2001
From: Andreas Regel <andreas.regel@powarman.de>
Date: Wed, 28 Jan 2004 19:11:00 +0100
Subject: Release version 0.0.3

- new TS->ES remuxer: now using VDR's cRemux for TS->PES and some own code
  for PES->ES
- now using libavcodec from ffmpeg instead of mpeg2dec
- frames to decode configurable (I-frames, I-/P-frames, all frames)
- frame dropping configurable
- added new color depths:
 - 128 shades greyscale
 - 128 colors with variable palette using Wu's quantizer (patch needed)
- changed osd size setting to 6 configurable values
---
 Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 74a085f..7d0906a 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
 ### The directory environment:
 
 DVBDIR = ../../../../DVB
+FFMDIR = ../../../../ffmpeg
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -40,18 +41,17 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I.
-LIBS     = -lmpeg2 -lmpeg2convert
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I. -I$(FFMDIR)/libavcodec
+LIBS     = -L$(FFMDIR)/libavcodec -lavcodec
 DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o osd.o receiver.o config.o i18n.o \
-  \
-  remux/tsremux.o remux/ts2ps.o remux/ts2es.o
+OBJS = $(PLUGIN).o osd.o receiver.o config.o i18n.o pes.o quantize.o
 
-libdvbmpeg/libdvbmpegtools.a: libdvbmpeg/*.c libdvbmpeg/*.cc libdvbmpeg/*.h libdvbmpeg/*.hh
-	make -C ./libdvbmpeg libdvbmpegtools.a
+ifdef FFMPEG_STATIC
+	DEFINES += -DHAVE_FFMPEG_STATIC
+endif
 
 ### Implicit rules:
 
@@ -71,7 +71,7 @@ $(DEPFILE): Makefile
 
 all: libvdr-$(PLUGIN).so
 
-libvdr-$(PLUGIN).so: $(OBJS) libdvbmpeg/libdvbmpegtools.a
+libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared -o $@ $^ $(LIBS)
 	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
 
@@ -85,4 +85,3 @@ dist: clean
 
 clean:
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
-	make -C libdvbmpeg clean
-- 
cgit v1.2.3