update to build with ffmpeg-svn (r12129)

11 files changed, 14 insertions, 13 deletions

diff --git a/contrib/vdr2jpeg/HISTORY b/contrib/vdr2jpeg/HISTORY
index e014934..17cf0e6 100644
--- a/contrib/vdr2jpeg/HISTORY
+++ b/contrib/vdr2jpeg/HISTORY
@@ -1,3 +1,6 @@
+0.1.0
+    update to build with ffmpeg-svn (r12129)
+    refactoring modules
 0.0.12
     show versionsnumber on help screen
     small fix to build with ffmpeg-svn (r10260)
diff --git a/contrib/vdr2jpeg/LIESMICH b/contrib/vdr2jpeg/LIESMICH
index a230b27..afc3452 100644
--- a/contrib/vdr2jpeg/LIESMICH
+++ b/contrib/vdr2jpeg/LIESMICH
@@ -6,7 +6,7 @@ um Vorschaubilder von Aufnahmen zu generieren.
 
 Erfordernisse
 -------------
-ffmpeg-svn (getestet mit r9303)
+ffmpeg-svn (getestet mit r12129)
 
 Empfohlen
 ------------
diff --git a/contrib/vdr2jpeg/Makefile b/contrib/vdr2jpeg/Makefile
index 43694c9..d286ad2 100644
--- a/contrib/vdr2jpeg/Makefile
+++ b/contrib/vdr2jpeg/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile -- for building vdr2jpeg
 #
-# Copyright (c) 2005-2007 Andreas Brachold
+# Copyright (c) 2005-2008 Andreas Brachold
 #
 # This code is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/contrib/vdr2jpeg/README b/contrib/vdr2jpeg/README
index a3ee408..47a2572 100644
--- a/contrib/vdr2jpeg/README
+++ b/contrib/vdr2jpeg/README
@@ -5,7 +5,7 @@ vdr2jpeg are used from xxv to generated preview images of recordings.
 
 Requirements
 -------------
-ffmpeg-svn (tested with r9303)
+ffmpeg-svn (tested with r12129)
 
 Recommended
 ------------
diff --git a/contrib/vdr2jpeg/ffm.cpp b/contrib/vdr2jpeg/ffm.cpp
index e4062cb..255a3b9 100644
--- a/contrib/vdr2jpeg/ffm.cpp
+++ b/contrib/vdr2jpeg/ffm.cpp
@@ -1,7 +1,7 @@
 /*
  * Simple program to grab images from VDR Recording
  *
- * Copyright (c) 2005-2007 Andreas Brachold
+ * Copyright (c) 2005-2008 Andreas Brachold
  * 
  * based on FFmpeg main Copyright (c) 2000-2003 Fabrice Bellard
  *
@@ -1352,7 +1352,7 @@ bool decode (const char* szMPVfile, /* const tPackedList & packed, */
         AVFormatContext *s = output_files[i];
 
         if (!(s->oformat->flags & AVFMT_NOFILE))
-	    url_fclose(&s->pb);
+	    url_fclose(s->pb);
 	for(j=0;j<s->nb_streams;j++)
 	    av_free(s->streams[j]);
         av_free(s);
diff --git a/contrib/vdr2jpeg/ffm.h b/contrib/vdr2jpeg/ffm.h
index 881b898..1be1de2 100644
--- a/contrib/vdr2jpeg/ffm.h
+++ b/contrib/vdr2jpeg/ffm.h
@@ -1,7 +1,7 @@
 /*
  * Simple program to grab images from VDR Recording
  *
- * Copyright (c) 2005-2006 Andreas Brachold
+ * Copyright (c) 2005-2008 Andreas Brachold
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/contrib/vdr2jpeg/gop.cpp b/contrib/vdr2jpeg/gop.cpp
index 832fd42..0395927 100644
--- a/contrib/vdr2jpeg/gop.cpp
+++ b/contrib/vdr2jpeg/gop.cpp
@@ -1,7 +1,7 @@
 /*
  * Simple program to grab images from VDR Recording
  *
- * Copyright(c) 2005-2007 Andreas Brachold
+ * Copyright(c) 2005-2008 Andreas Brachold
  * 
  * demux ported from vdrsync.pl : Copyright(c) 2005 Peter Sebbel 
  *
diff --git a/contrib/vdr2jpeg/gop.h b/contrib/vdr2jpeg/gop.h
index 1654058..705755f 100644
--- a/contrib/vdr2jpeg/gop.h
+++ b/contrib/vdr2jpeg/gop.h
@@ -1,7 +1,7 @@
 /*
  * Simple program to grab images from VDR Recording
  *
- * Copyright(c) 2005-2007 Andreas Brachold
+ * Copyright(c) 2005-2008 Andreas Brachold
  * 
  * demux ported from vdrsync.pl : Copyright(c) 2005 Peter Sebbel 
  *
diff --git a/contrib/vdr2jpeg/tools.cpp b/contrib/vdr2jpeg/tools.cpp
index e15d12c..761e3c1 100644
--- a/contrib/vdr2jpeg/tools.cpp
+++ b/contrib/vdr2jpeg/tools.cpp
@@ -1,7 +1,7 @@
 /*
  * Simple program to grab images from VDR Recording
  *
- * Copyright(c) 2007 Andreas Brachold
+ * Copyright(c) 2007-2008 Andreas Brachold
  *
  * This code is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/contrib/vdr2jpeg/tools.h b/contrib/vdr2jpeg/tools.h
index a0ea91d..7a1b062 100644
--- a/contrib/vdr2jpeg/tools.h
+++ b/contrib/vdr2jpeg/tools.h
@@ -1,7 +1,7 @@
 /*
  * Simple program to grab images from VDR Recording
  *
- * Copyright(c) 2007 Andreas Brachold
+ * Copyright(c) 2007-2008 Andreas Brachold
  *
  * This code is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/contrib/vdr2jpeg/vdr2jpeg.cpp b/contrib/vdr2jpeg/vdr2jpeg.cpp
index 2a7aa63..e3629e3 100644
--- a/contrib/vdr2jpeg/vdr2jpeg.cpp
+++ b/contrib/vdr2jpeg/vdr2jpeg.cpp
@@ -1,10 +1,8 @@
 /*
  * Simple program to grab images from VDR Recording
  *
- * Copyright(c) 2005-2007 Andreas Brachold
+ * Copyright(c) 2005-2008 Andreas Brachold
  * 
- * demux ported from vdrsync.pl : Copyright(c) 2005 Peter Sebbel 
- *
  * 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