From 1970db6a30ced92c78ff10b3bd2ab21b41fba994 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 17 Aug 2008 10:01:48 +0000
Subject: * update to build with ffmpeg-svn (r14788)

---
 contrib/vdr2jpeg/Makefile | 4 ++--
 contrib/vdr2jpeg/README   | 6 +++---
 contrib/vdr2jpeg/ffm.cpp  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/vdr2jpeg/Makefile b/contrib/vdr2jpeg/Makefile
index f39af73..172dcaf 100644
--- a/contrib/vdr2jpeg/Makefile
+++ b/contrib/vdr2jpeg/Makefile
@@ -65,8 +65,8 @@ 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
 else
-INCLUDES += $(shell $(PKG-CONFIG) --cflags libavformat libavcodec libswscale)
-LIBS    += $(shell $(PKG-CONFIG) --libs libavformat libavcodec libswscale)
+INCLUDES += $(shell $(PKG-CONFIG) --cflags libavformat libavcodec libavutil libswscale)
+LIBS    += $(shell $(PKG-CONFIG) --libs libavformat libavcodec libavutil libswscale)
 endif
 
 ifdef STATIC
diff --git a/contrib/vdr2jpeg/README b/contrib/vdr2jpeg/README
index 47a2572..161c5b3 100644
--- a/contrib/vdr2jpeg/README
+++ b/contrib/vdr2jpeg/README
@@ -5,14 +5,14 @@ vdr2jpeg are used from xxv to generated preview images of recordings.
 
 Requirements
 -------------
-ffmpeg-svn (tested with r12129)
+ffmpeg-svn (tested with r14788)
 
 Recommended
 ------------
 ffmpeg as shared libary and with software scaler
 
 $ cd ffmpeg && \
- ./configure --enable-shared --enable-swscaler && \
+ ./configure --enable-shared --enable-swscale && \
   make && \
   make install
 
@@ -52,8 +52,8 @@ e.g. to extract frames 5000,10000,15000 (at 3,6,9 Minutes)
 $ vdr2jpeg -r /video/Auf_der_Flucht/2004-12-28.22:10.50.99.rec \
 	-f 5000 -f 10000 -f 15000
 
+
 same using with selected span of frames
 
 $ vdr2jpeg -r /video/Auf_der_Flucht/2004-12-28.22:10.50.99.rec \
 	-f 5000 -s 10000 -i 5000
-
diff --git a/contrib/vdr2jpeg/ffm.cpp b/contrib/vdr2jpeg/ffm.cpp
index fb4be80..658a8dc 100644
--- a/contrib/vdr2jpeg/ffm.cpp
+++ b/contrib/vdr2jpeg/ffm.cpp
@@ -20,10 +20,10 @@
 #include "ffm.h"
 
 extern "C" {
-#include <avutil.h>
-#include <avcodec.h>
-#include <avformat.h>
-#include <swscale.h>
+#include <libavutil/avutil.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
 }
 
 static int frame_width = 0;
-- 
cgit v1.2.3