diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-03-24 14:20:13 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-03-24 14:20:13 +0000 |
| commit | b59b488689bd7111dbcb2e10b35f1bbb99b6ad62 (patch) | |
| tree | dc217c442f3fa5c954bd5f039ab49470e0e70869 /contrib | |
| parent | 5f9b4dc2fe5d12325a9a35101ce694cd371c3c65 (diff) | |
| download | xxv-b59b488689bd7111dbcb2e10b35f1bbb99b6ad62.tar.gz xxv-b59b488689bd7111dbcb2e10b35f1bbb99b6ad62.tar.bz2 | |
* remove predefined include to ffmpeg libraries, unneeded by pkg-config
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/vdr2jpeg/Makefile | 2 | ||||
| -rw-r--r-- | contrib/vdr2jpeg/ffm.cpp | 8 | ||||
| -rw-r--r-- | contrib/vdr2jpeg/vdr2jpeg.cpp | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/contrib/vdr2jpeg/Makefile b/contrib/vdr2jpeg/Makefile index d286ad2..c1daa74 100644 --- a/contrib/vdr2jpeg/Makefile +++ b/contrib/vdr2jpeg/Makefile @@ -30,7 +30,7 @@ #DEBUG = 1 # Build full static paket, if ffmpeg build without --enable-shared -# you must defined FFMDIR +# you should defined FFMDIR #STATIC = 1 # Place where vdr2jpeg should installed diff --git a/contrib/vdr2jpeg/ffm.cpp b/contrib/vdr2jpeg/ffm.cpp index 255a3b9..b0bd50c 100644 --- a/contrib/vdr2jpeg/ffm.cpp +++ b/contrib/vdr2jpeg/ffm.cpp @@ -31,18 +31,10 @@ #include "ffm.h" extern "C" { - -#ifdef FFMDIR #include <avutil.h> #include <avcodec.h> #include <avformat.h> #include <swscale.h> -#else -#include <ffmpeg/avutil.h> -#include <ffmpeg/avcodec.h> -#include <ffmpeg/avformat.h> -#include <ffmpeg/swscale.h> -#endif } static int frame_width = 0; diff --git a/contrib/vdr2jpeg/vdr2jpeg.cpp b/contrib/vdr2jpeg/vdr2jpeg.cpp index e3629e3..02f44a6 100644 --- a/contrib/vdr2jpeg/vdr2jpeg.cpp +++ b/contrib/vdr2jpeg/vdr2jpeg.cpp @@ -31,7 +31,7 @@ #include "gop.h" -static const char *VERSION = "0.1.0"; +static const char *VERSION = "0.1.1"; void help(int argc, char *argv[]) { |