From fcb2e1469f4a689a5256c36e46486bacf04b12e8 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Mon, 24 Mar 2008 14:53:57 +0000
Subject: * remove predefined include to ffmpeg libraries, unneeded by
 pkg-config * add keywords to header

---
 liboutput/Makefile | 23 ++++++++++++++++++++++-
 liboutput/encode.c |  8 ++------
 liboutput/encode.h |  4 ----
 3 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'liboutput')

diff --git a/liboutput/Makefile b/liboutput/Makefile
index 0392ce4..b9b0e0d 100644
--- a/liboutput/Makefile
+++ b/liboutput/Makefile
@@ -1,7 +1,28 @@
 #
-# Makefile for a Video Disk Recorder plugin
+# Makefile for Image plugin to VDR
+#
+# (C) 2004-2007 Andreas Brachold    <anbr at users.berlios.de>
+#
+# This code is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This code is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+
+# You can change the compile options here or create a Make.config
+# in the VDR directory an set them there.
 #
 # $Id$
+#
 
 VDRDIR = ../../../..
 
diff --git a/liboutput/encode.c b/liboutput/encode.c
index 9877340..e0bf29f 100644
--- a/liboutput/encode.c
+++ b/liboutput/encode.c
@@ -24,15 +24,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-extern "C" {
 #ifdef HAVE_SWSCALER
-#ifdef FFMDIR
+extern "C" {
 #include <swscale.h>
-#else
-#include <ffmpeg/swscale.h>
-#endif
-#endif
 }
+#endif
 
 #include "encode.h"
 #include <vdr/device.h>
diff --git a/liboutput/encode.h b/liboutput/encode.h
index 2c544b1..2959197 100644
--- a/liboutput/encode.h
+++ b/liboutput/encode.h
@@ -24,11 +24,7 @@
 #define _ENCODE_H
 
 extern "C" {
-#ifdef FFMDIR
 #include <avcodec.h>
-#else
-#include <ffmpeg/avcodec.h>
-#endif 
 }
 
 #include "../setup-image.h"
-- 
cgit v1.2.3