Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (d7ec0f339840c340b9db93160b364b0d6636f20d)

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 master grimoire by Arwed von Merkatz (d7ec0f339840c340b9db93160b364b0d6636f20d)
  • Date: Thu, 22 Nov 2007 12:39:41 -0600

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

video/mplayer/HISTORY | 4 ++++
video/mplayer/PRE_BUILD | 5 -----
video/mplayer/libavformat-api.patch | 22 ----------------------
3 files changed, 4 insertions(+), 27 deletions(-)

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

mplayer: removed ffmpeg api patch

diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 8df7591..9b25820 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2007-11-22 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, libavformat-api.patch: removed, they caught up with the
+ ffmpeg changes
+
2007-11-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, libavformat-api.patch: fix to support latest ffmpeg-svn

diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
deleted file mode 100755
index 5582beb..0000000
--- a/video/mplayer/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ $MPLAYER_SVN == y ]]; then
- patch -p0 < $SPELL_DIRECTORY/libavformat-api.patch
-fi
diff --git a/video/mplayer/libavformat-api.patch
b/video/mplayer/libavformat-api.patch
deleted file mode 100644
index 788cd1a..0000000
--- a/video/mplayer/libavformat-api.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libmpdemux/muxer_lavf.c
-===================================================================
---- libmpdemux/muxer_lavf.c (revision 25134)
-+++ libmpdemux/muxer_lavf.c (working copy)
-@@ -317,7 +317,7 @@
- av_freep(&(priv->oc->streams[i]));
- }
-
-- url_fclose(&(priv->oc->pb));
-+ url_fclose((priv->oc->pb));
-
- av_free(priv->oc);
- }
-@@ -400,7 +400,7 @@
- goto fail;
- }
-
-- ((URLContext*)(priv->oc->pb.opaque))->priv_data= muxer;
-+ ((URLContext*)(priv->oc->pb->opaque))->priv_data= muxer;
-
- muxer->priv = (void *) priv;
- muxer->cont_new_stream = &lavf_new_stream;



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (d7ec0f339840c340b9db93160b364b0d6636f20d), Arwed von Merkatz, 11/22/2007

Archive powered by MHonArc 2.6.24.

Top of Page