Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (a9d980c1493385ad5e34b2778dd7f53bedaa023c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ethan Grammatikidis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (a9d980c1493385ad5e34b2778dd7f53bedaa023c)
  • Date: Mon, 18 Feb 2008 11:38:20 -0600

GIT changes to master grimoire by Ethan Grammatikidis <eekee57 AT fastmail.fm>:

video/ffmpeg-svn/300_c++_compliant_headers.diff | 15 +++++++--------
video/ffmpeg-svn/HISTORY | 5 +++++
2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit a9d980c1493385ad5e34b2778dd7f53bedaa023c
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

ffmpeg-svn: regenerated the patch for c++ header complience.

commit 1c72db89b466d2c91adcf6c806fdd4fbd79e8a24
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

Revert "ffmpeg-svn: removed patch for c++ complant headers"

This reverts commit 099c6e3c6a21f9fcf3cc9e12ed81ffcab37aea84.

commit 099c6e3c6a21f9fcf3cc9e12ed81ffcab37aea84
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

ffmpeg-svn: removed patch for c++ complant headers

diff --git a/video/ffmpeg-svn/300_c++_compliant_headers.diff
b/video/ffmpeg-svn/300_c++_compliant_headers.diff
index a209c4d..f1548f0 100644
--- a/video/ffmpeg-svn/300_c++_compliant_headers.diff
+++ b/video/ffmpeg-svn/300_c++_compliant_headers.diff
@@ -1,8 +1,6 @@
-Index: ffmpeg-0.cvs20070307/libavcodec/avcodec.h
-===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/avcodec.h 2007-03-29
22:22:06.000000000 +0200
-+++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h 2007-03-29 22:23:03.000000000
+0200
-@@ -34,6 +34,14 @@
+--- ffmpeg-svn/libavcodec/avcodec.h.orig 2008-02-18
17:25:06.000000000 +0000
++++ ffmpeg-svn/libavcodec/avcodec.h 2008-02-18 17:27:07.000000000 +0000
+@@ -30,6 +30,14 @@
#include "avutil.h"
#include <sys/types.h> /* size_t */

@@ -14,6 +12,7 @@ Index: ffmpeg-0.cvs20070307/libavcodec/avcodec.h
+#endif
+#endif
+
- #define AV_STRINGIFY(s) AV_TOSTRING(s)
- #define AV_TOSTRING(s) #s
-
+ #define LIBAVCODEC_VERSION_INT ((51<<16)+(50<<8)+1)
+ #define LIBAVCODEC_VERSION 51.50.1
+ #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
+
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 99cc8d1..cee0a64 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,8 @@
+2008-02-18 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * 300_c++_compliant_headers.diff: regenerated for todays svn.
+ May I note that I think maintaining a patch against an scm-based
+ spell is a bad idea?
+
2007-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PREPARE, DETAILS: removed amr-nb-fixed, not supported anymore
* BUILD, DETAILS, PREPARE, PRE_BUILD: commented out the whole amr



  • [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (a9d980c1493385ad5e34b2778dd7f53bedaa023c), Ethan Grammatikidis, 02/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page