* update to build with gcc 4.3

5 files changed, 19 insertions, 17 deletions

diff --git a/contrib/vdr2jpeg/Makefile b/contrib/vdr2jpeg/Makefile
index 172dcaf..8941bf1 100644
--- a/contrib/vdr2jpeg/Makefile
+++ b/contrib/vdr2jpeg/Makefile
@@ -1,4 +1,4 @@
-##########################################################################
+################################################################################
 #
 # Makefile -- for building vdr2jpeg
 #
@@ -12,13 +12,13 @@
 # You can change the compile options here or create a Make.config
 
 
-# Build ffmpeg e.g. with ./configure --enable-shared
+# Build ffmpeg e.g. with ./configure --enable-shared --enable-swscale
 #FFMDIR = /usr/local/include/ffmpeg
 
 # Build with debugging symbol and lots of dumped messages
 #DEBUG = 1
 
-# Build full static paket, if ffmpeg build without --enable-shared
+# Build full static paket, if ffmpeg configured without --enable-shared
 # you should defined FFMDIR 
 #STATIC = 1
 
@@ -28,23 +28,21 @@ INSTALLBINDIR ?= /usr/local/bin
 # Place where should package created, need some space.
 TMPDIR = /tmp
 
-###############################################
-###############################################
+################################################################################
 #
-# no user configurable options below this point
+# there none user configurable options below this point
 #
-###############################################
+################################################################################
 
 INSTALLDIR = $(DESTDIR)/$(INSTALLBINDIR)
 
-###############################################
-
+################################################################################
 # Compiler/linker settings
 CXX      ?= g++
 STRIP    ?= strip
 PKG-CONFIG ?= pkg-config
 
-### Allow user defined options to overwrite defaults:
+# Allow user defined options to overwrite defaults:
 -include Make.config
 
 # General settings:
@@ -62,8 +60,8 @@ CXXFLAGS += -fPIC -Wall -Woverloaded-virtual
 
 
 ifdef FFMDIR
-INCLUDES += -I$(FFMDIR)/libavformat -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil -I$(FFMDIR)/libswscale 
-LIBS += -L$(FFMDIR)/libavformat -L$(FFMDIR)/libavcodec -L$(FFMDIR)/libavutil  -L$(FFMDIR)/libswscale
+INCLUDES += -I$(FFMDIR) 
+LIBS += -L$(FFMDIR)/libavformat -L$(FFMDIR)/libavcodec -L$(FFMDIR)/libavutil -L$(FFMDIR)/libswscale
 else
 INCLUDES += $(shell $(PKG-CONFIG) --cflags libavformat libavcodec libavutil libswscale)
 LIBS    += $(shell $(PKG-CONFIG) --libs libavformat libavcodec libavutil libswscale)
@@ -73,7 +71,7 @@ ifdef STATIC
     CXXFLAGS += -static
 endif
 
-#-------------------------------------------------------------------------
+################################################################################
 # Target configuration
 
 PRGNAME = vdr2jpeg
@@ -90,15 +88,15 @@ OBJS = tools.o gop.o ffm.o
 VDR2JPEGOBJS = vdr2jpeg.o
 
 
-#-------------------------------------------------------------------------
+################################################################################
 # Implicit rules:
 
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 
-#-------------------------------------------------------------------------
-# Main Targets
+################################################################################
+# Main targets :
 
 all:    vdr2jpeg
 .PHONY: all
diff --git a/contrib/vdr2jpeg/ffm.cpp b/contrib/vdr2jpeg/ffm.cpp
index 658a8dc..348ef7f 100644
--- a/contrib/vdr2jpeg/ffm.cpp
+++ b/contrib/vdr2jpeg/ffm.cpp
@@ -51,7 +51,7 @@ static int max_frames[4] = {INT_MAX, INT_MAX, INT_MAX, INT_MAX};
 static int video_qdiff = 3;
 
 
-static char *video_rc_eq="tex^qComp";
+static const char *video_rc_eq="tex^qComp";
 static int me_method = ME_EPZS;
 
 static int same_quality = 1;
diff --git a/contrib/vdr2jpeg/gop.cpp b/contrib/vdr2jpeg/gop.cpp
index f0a9930..2040fc6 100644
--- a/contrib/vdr2jpeg/gop.cpp
+++ b/contrib/vdr2jpeg/gop.cpp
@@ -15,6 +15,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <time.h>
diff --git a/contrib/vdr2jpeg/tools.cpp b/contrib/vdr2jpeg/tools.cpp
index 00d4579..9e73352 100644
--- a/contrib/vdr2jpeg/tools.cpp
+++ b/contrib/vdr2jpeg/tools.cpp
@@ -8,6 +8,7 @@
  *
  */
 
+#include <string.h>
 #include "tools.h"
 
 int option(int argc, char *argv[], const char opt, bool bParam,
diff --git a/contrib/vdr2jpeg/vdr2jpeg.cpp b/contrib/vdr2jpeg/vdr2jpeg.cpp
index 5eda8f3..3c60fc9 100644
--- a/contrib/vdr2jpeg/vdr2jpeg.cpp
+++ b/contrib/vdr2jpeg/vdr2jpeg.cpp
@@ -11,10 +11,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>       
 #include <fcntl.h>
+#include <stdlib.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <vector>
+#include <algorithm>
 #include "tools.h"
 #include "ffm.h"
 #include "gop.h"