Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.15 grimoire by Arwed von Merkatz (f5619720c6ce2f5aad40f91247f4616a92f76549)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.15 grimoire by Arwed von Merkatz (f5619720c6ce2f5aad40f91247f4616a92f76549)
  • Date: Sat, 24 Nov 2007 07:18:22 -0600

GIT changes to stable-0.15 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

video/vlc/HISTORY | 3 +++
video/vlc/PRE_BUILD | 3 +++
video/vlc/ffmpeg-api.patch | 14 ++++++++++++++
3 files changed, 20 insertions(+)

New commits:
commit f5619720c6ce2f5aad40f91247f4616a92f76549
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

vlc: support latest ffmpeg-svn
(cherry picked from commit 04c9d7df085ec6033993ce25e9d0f8aa67682609)

diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index bdc1ba6..f7529be 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2007-11-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, ffmpeg-api.patch: fix for latest ffmpeg-svn support
+
2007-10-22 Pol Vinogradov <vin.public AT gmail.com>
* BUILD: install_rootifying paths, added iceweasel support

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 0f7b0e7..73f6f8d 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -12,5 +12,8 @@ fi &&
# available
patch -p0 < $SCRIPT_DIRECTORY/old-faad2.patch &&

+# patch for ffmpeg-svn of 2007-11-21, also supports older versions
+patch -p0 < $SPELL_DIRECTORY/ffmpeg-api.patch &&
+
# fix png linking
sedit 's/-lpng -lz/-lpng -lm -lz/' configure
diff --git a/video/vlc/ffmpeg-api.patch b/video/vlc/ffmpeg-api.patch
new file mode 100644
index 0000000..03037a6
--- /dev/null
+++ b/video/vlc/ffmpeg-api.patch
@@ -0,0 +1,14 @@
+--- modules/codec/ffmpeg/mux.c.orig 2007-11-21 21:47:16.000000000 +0100
++++ modules/codec/ffmpeg/mux.c 2007-11-21 21:49:41.000000000 +0100
+@@ -133,7 +133,11 @@
+ return VLC_EGENERIC;
+ }
+
++#if (LIBAVFORMAT_BUILD >= ((52<<16)+(0<<8)+0))
++ p_sys->oc->pb = &p_sys->io;
++#else
+ p_sys->oc->pb = p_sys->io;
++#endif
+ p_sys->oc->nb_streams = 0;
+
+ p_sys->b_write_header = VLC_TRUE;



  • [SM-Commit] GIT changes to stable-0.15 grimoire by Arwed von Merkatz (f5619720c6ce2f5aad40f91247f4616a92f76549), Arwed von Merkatz, 11/24/2007

Archive powered by MHonArc 2.6.24.

Top of Page