diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-10-08 16:57:26 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-10-08 16:57:26 +0000 |
| commit | 0778564d671c69aaada532603f2fa7532b82f2cc (patch) | |
| tree | 660f9d70346269906d37a67a4f222ab06bf09832 /liboutput | |
| parent | cb36103e1c1aedec0ba724aa50b81300b89478d8 (diff) | |
| download | vdr-plugin-image-0778564d671c69aaada532603f2fa7532b82f2cc.tar.gz vdr-plugin-image-0778564d671c69aaada532603f2fa7532b82f2cc.tar.bz2 | |
* Updated italian translation
* Update header to use with ffmpeg-svn 14788
Diffstat (limited to 'liboutput')
| -rw-r--r-- | liboutput/Makefile | 4 | ||||
| -rw-r--r-- | liboutput/encode.c | 2 | ||||
| -rw-r--r-- | liboutput/encode.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/liboutput/Makefile b/liboutput/Makefile index a6ed805..d5f4bdd 100644 --- a/liboutput/Makefile +++ b/liboutput/Makefile @@ -27,11 +27,11 @@ PKG-CONFIG ?= pkg-config INCLUDES += -I$(VDRDIR)/include -I. ifdef FFMDIR -INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil +INCLUDES += -I$(FFMDIR) DEFINES += -DFFMDIR ifndef WITHOUT_SWSCALER DEFINES += -DHAVE_SWSCALER - INCLUDES += -I$(FFMDIR)/libswscale + INCLUDES += -I$(FFMDIR) endif else diff --git a/liboutput/encode.c b/liboutput/encode.c index 51b7cc5..4f9b508 100644 --- a/liboutput/encode.c +++ b/liboutput/encode.c @@ -15,7 +15,7 @@ #ifdef HAVE_SWSCALER extern "C" { -#include <swscale.h> +#include <libswscale/swscale.h> } #endif diff --git a/liboutput/encode.h b/liboutput/encode.h index 37dd091..9e944c9 100644 --- a/liboutput/encode.h +++ b/liboutput/encode.h @@ -13,7 +13,7 @@ #define _ENCODE_H extern "C" { -#include <avcodec.h> +#include <libavcodec/avcodec.h> } #include "../setup-image.h" |