diff options
-rw-r--r-- | Makefile | 10 | ||||
-rwxr-xr-x | contrib/image_pregen.sh | 3 | ||||
-rwxr-xr-x | contrib/install-scripts.sh | 3 | ||||
-rw-r--r-- | libimage/Makefile | 23 | ||||
-rw-r--r-- | liboutput/Makefile | 23 | ||||
-rw-r--r-- | liboutput/encode.c | 8 | ||||
-rw-r--r-- | liboutput/encode.h | 4 | ||||
-rw-r--r-- | po/es_ES.po | 2 | ||||
-rw-r--r-- | po/hu_HU.po | 2 | ||||
-rw-r--r-- | po/image.pot | 2 | ||||
-rwxr-xr-x | scripts/imageplugin.sh | 3 | ||||
-rwxr-xr-x | scripts/magickplugin.sh | 3 | ||||
-rwxr-xr-x | scripts/mount.sh | 2 |
13 files changed, 71 insertions, 17 deletions
@@ -1,7 +1,7 @@ # # Makefile for Image plugin to VDR # -# (C) 2004-2007 Andreas Brachold <anbr at users.berlios.de> +# (C) 2004-2008 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 @@ -20,6 +20,10 @@ # You can change the compile options here or create a Make.config # in the VDR directory an set them there. +# +# $Id$ +# + ### uncomment the following line, if you don't have libexif installed #WITHOUT_LIBEXIF=1 @@ -98,8 +102,10 @@ ifndef WITHOUT_SWSCALER LIBS += -L$(FFMDIR)/libswscale -lswscale endif else - PKG-LIBS += libavcodec + PKG-LIBS += libavcodec + PKG-INCLUDES += libavcodec ifndef WITHOUT_SWSCALER + PKG-INCLUDES += libswscale PKG-LIBS += libswscale endif endif diff --git a/contrib/image_pregen.sh b/contrib/image_pregen.sh index 8a89fd6..acbb4aa 100755 --- a/contrib/image_pregen.sh +++ b/contrib/image_pregen.sh @@ -1,4 +1,7 @@ #!/bin/bash +# +# $Id$ +# # image_pregen.sh # # call with file or dir to pregenerate the file or dir diff --git a/contrib/install-scripts.sh b/contrib/install-scripts.sh index 8f2d34d..b8d0219 100755 --- a/contrib/install-scripts.sh +++ b/contrib/install-scripts.sh @@ -1,4 +1,7 @@ #!/bin/sh +# +# $Id$ +# #set -xv pushd $(dirname $0) &>/dev/null diff --git a/libimage/Makefile b/libimage/Makefile index e46bb0c..1f07375 100644 --- a/libimage/Makefile +++ b/libimage/Makefile @@ -1,7 +1,28 @@ # -# Makefile for a Video Disk Recorder plugin +# Makefile for Image plugin to VDR +# +# (C) 2004-2008 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/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" diff --git a/po/es_ES.po b/po/es_ES.po index c871096..3fe345d 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-image 0.3.0\n" "Report-Msgid-Bugs-To: Andreas Brachold <anbr at user.berlios.de>\n" -"POT-Creation-Date: 2008-01-02 11:29+0100\n" +"POT-Creation-Date: 2008-03-24 15:44+0100\n" "PO-Revision-Date: 2007-08-18 08:13+0200\n" "Last-Translator: Jesús Bravo Álvarez <EMAIL at ADDRESS>\n" "Language-Team: <vdr at linuxtv.org>\n" diff --git a/po/hu_HU.po b/po/hu_HU.po index 62370b9..20448b3 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-image 0.3.0\n" "Report-Msgid-Bugs-To: Andreas Brachold <anbr at user.berlios.de>\n" -"POT-Creation-Date: 2008-01-02 11:29+0100\n" +"POT-Creation-Date: 2008-03-24 15:44+0100\n" "PO-Revision-Date: 2007-08-18 08:13+0200\n" "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n" "Language-Team: <vdr at linuxtv.org>\n" diff --git a/po/image.pot b/po/image.pot index 48a3fbd..b0012a2 100644 --- a/po/image.pot +++ b/po/image.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Andreas Brachold <anbr at user.berlios.de>\n" -"POT-Creation-Date: 2008-01-02 11:29+0100\n" +"POT-Creation-Date: 2008-03-24 15:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/scripts/imageplugin.sh b/scripts/imageplugin.sh index 28ed564..0ff0c72 100755 --- a/scripts/imageplugin.sh +++ b/scripts/imageplugin.sh @@ -1,4 +1,7 @@ #!/bin/bash +# +# $Id$ +# # script for vdr-imageplugin to convert the selected image to pnm-image # needs : netpbm-progs > anytopnm pnmscalefixed pnmfile pnmcut pnmflip # diff --git a/scripts/magickplugin.sh b/scripts/magickplugin.sh index fd54df9..8dacee6 100755 --- a/scripts/magickplugin.sh +++ b/scripts/magickplugin.sh @@ -1,4 +1,7 @@ #!/bin/bash +# +# $Id$ +# # script for vdr-imageplugin to convert the selected image to pnm-image # needs : imagemagick > identify convert # diff --git a/scripts/mount.sh b/scripts/mount.sh index 65cb6e0..2b289f2 100755 --- a/scripts/mount.sh +++ b/scripts/mount.sh @@ -1,5 +1,7 @@ #!/bin/bash # +# $Id$ +# # This script is called from VDR to mount/unmount/eject # the sources for MP3 play and/or image sources, # |