From 1f7ff5d00b83cbeb0afee85042d60aa2e60dbdd0 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Mon, 13 Apr 2009 09:47:34 +0000
Subject: * adapt for ffmpeg-0.5

---
 contrib/vdr2jpeg/Makefile | 6 ++++--
 contrib/vdr2jpeg/ffm.cpp  | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/contrib/vdr2jpeg/Makefile b/contrib/vdr2jpeg/Makefile
index d62819b..14cf9ec 100644
--- a/contrib/vdr2jpeg/Makefile
+++ b/contrib/vdr2jpeg/Makefile
@@ -34,9 +34,11 @@ TMPDIR = /tmp
 # there none user configurable options below this point
 #
 ################################################################################
-
+ifdef DESTDIR
 INSTALLDIR = $(DESTDIR)/$(INSTALLBINDIR)
-
+else
+INSTALLDIR = $(INSTALLBINDIR)
+endif
 ################################################################################
 # Compiler/linker settings
 CXX      ?= g++
diff --git a/contrib/vdr2jpeg/ffm.cpp b/contrib/vdr2jpeg/ffm.cpp
index d52cf36..66b76bf 100644
--- a/contrib/vdr2jpeg/ffm.cpp
+++ b/contrib/vdr2jpeg/ffm.cpp
@@ -957,7 +957,7 @@ static bool opt_input_file(const char *filename)
     int64_t timestamp;
 
     /* get default parameters from command line */
-    ic = av_alloc_format_context();
+    ic = avformat_alloc_context();
 
     memset(ap, 0, sizeof(*ap));
     ap->prealloced_context = 1;
@@ -1200,7 +1200,7 @@ static bool opt_output_file(const char *filename)
     int use_video, input_has_video = 0;
     AVFormatParameters params, *ap = &params;
 
-    oc = av_alloc_format_context();
+    oc = avformat_alloc_context();
 
     if (!file_oformat) {
         file_oformat = guess_format(NULL, filename, NULL);
-- 
cgit v1.2.3