diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2007-08-29 16:47:37 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2007-08-29 16:47:37 +0000 |
| commit | af03d0b4d0a51eea8cd4f57c1f559b6add089102 (patch) | |
| tree | 5b4ba5b7ebe0dcee780daa3f880855dcb0e2b10a | |
| parent | 929729a99180a20685c921f14730a6defceeeafc (diff) | |
| download | xxv-af03d0b4d0a51eea8cd4f57c1f559b6add089102.tar.gz xxv-af03d0b4d0a51eea8cd4f57c1f559b6add089102.tar.bz2 | |
* Release vdr2jpeg-0.0.12
show versionsnumber on help screen
small fix to build with ffmpeg-svn (r10260)
| -rw-r--r-- | contrib/vdr2jpeg/HISTORY | 3 | ||||
| -rw-r--r-- | contrib/vdr2jpeg/Makefile | 2 | ||||
| -rw-r--r-- | contrib/vdr2jpeg/ffm.cpp | 2 | ||||
| -rw-r--r-- | contrib/vdr2jpeg/vdr2jpeg.cpp | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/contrib/vdr2jpeg/HISTORY b/contrib/vdr2jpeg/HISTORY index 3e5c08e..e014934 100644 --- a/contrib/vdr2jpeg/HISTORY +++ b/contrib/vdr2jpeg/HISTORY @@ -1,3 +1,6 @@ +0.0.12 + show versionsnumber on help screen + small fix to build with ffmpeg-svn (r10260) 0.0.11 update to build with ffmpeg-svn (r9303) add options for frame span diff --git a/contrib/vdr2jpeg/Makefile b/contrib/vdr2jpeg/Makefile index 1b6c771..0c42238 100644 --- a/contrib/vdr2jpeg/Makefile +++ b/contrib/vdr2jpeg/Makefile @@ -88,7 +88,7 @@ endif # Target configuration PRGNAME = vdr2jpeg -VERSION = 0.0.11 +VERSION = $(shell grep 'static const char \*VERSION *=' vdr2jpeg.cpp | awk '{ print $$6 }' | sed -e 's/[";]//g') ARCHIVE = $(PRGNAME)-$(VERSION) DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS FILES = README LIESMICH HISTORY COPYING Makefile vdr2jpeg.cpp ffm.cpp ffm.h diff --git a/contrib/vdr2jpeg/ffm.cpp b/contrib/vdr2jpeg/ffm.cpp index 09d2900..2ce18de 100644 --- a/contrib/vdr2jpeg/ffm.cpp +++ b/contrib/vdr2jpeg/ffm.cpp @@ -1105,7 +1105,7 @@ static bool new_video_stream(AVFormatContext *oc) fprintf(stderr, "Could not alloc stream\n"); return false; } - //avcodec_get_context_defaults2(st->codec, CODEC_TYPE_VIDEO); + avcodec_get_context_defaults2(st->codec, CODEC_TYPE_VIDEO); video_enc = st->codec; diff --git a/contrib/vdr2jpeg/vdr2jpeg.cpp b/contrib/vdr2jpeg/vdr2jpeg.cpp index 216e8f6..86a9f60 100644 --- a/contrib/vdr2jpeg/vdr2jpeg.cpp +++ b/contrib/vdr2jpeg/vdr2jpeg.cpp @@ -37,7 +37,7 @@ #include "ffm.h" - +static const char *VERSION = "0.0.12"; struct tFrame { @@ -605,7 +605,7 @@ bool decodegop(const std::string & szFile, void help(int argc, char *argv[]) { - std::cerr << "Usage: " << argv[0] << std::endl; + std::cerr << "Usage: " << argv[0] << " (" << VERSION << ")" << std::endl; std::cerr << " -r recordings : VDR recording folder" << std::endl; std::cerr << " -f frame : wanted frame (resolution at PAL - 1/25s)" << std::endl; std::cerr << " -o outdirectory : output folder" << std::endl; |