Skip to Content.
Sympa Menu

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

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 (0798ab0d137cf1c4fc869d2e90aaf472a298d9d9)
  • Date: Sun, 9 Dec 2007 09:54:49 -0600

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

video/kino/HISTORY | 4 ++++
video/kino/PRE_BUILD | 3 +++
video/kino/ffmpeg-api.patch | 29 +++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)

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

kino: patch to work with latest ffmpeg-svn

diff --git a/video/kino/HISTORY b/video/kino/HISTORY
index 5b50238..98ef229 100644
--- a/video/kino/HISTORY
+++ b/video/kino/HISTORY
@@ -1,3 +1,7 @@
+2007-12-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, ffmpeg-api.patch: patch from kino cvs to support latest
+ ffmpeg-svn api
+
2007-08-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.1

diff --git a/video/kino/PRE_BUILD b/video/kino/PRE_BUILD
new file mode 100755
index 0000000..32fa003
--- /dev/null
+++ b/video/kino/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/ffmpeg-api.patch
diff --git a/video/kino/ffmpeg-api.patch b/video/kino/ffmpeg-api.patch
new file mode 100644
index 0000000..8a20194
--- /dev/null
+++ b/video/kino/ffmpeg-api.patch
@@ -0,0 +1,29 @@
+--- src/frame.cc.orig 2007-12-09 16:43:25.000000000 +0100
++++ src/frame.cc 2007-12-09 16:44:27.000000000 +0100
+@@ -1309,8 +1309,12 @@
+ if ( avformatEncoder )
+ {
+ avformatEncoder->oformat = guess_format( "dv", NULL,
NULL );
+- av_new_stream( avformatEncoder, 0 );
+- AVCodecContext *avcodecEncoder =
avformatEncoder->streams[0]->codec;
++ AVStream* vst = av_new_stream( avformatEncoder, 0 );
++ vst->codec->codec_type = CODEC_TYPE_VIDEO;
++ vst->codec->codec_id = CODEC_ID_DVVIDEO;
++ vst->codec->bit_rate = 25000000;
++ vst->start_time = 0;
++ AVCodecContext *avcodecEncoder = vst->codec;
+ avcodecEncoder->width = FRAME_MAX_WIDTH;
+ avcodecEncoder->height = isPAL ? 576 : 480;
+ if ( isPAL )
+@@ -1446,7 +1450,11 @@
+ isEncoderHeaderWritten = true;
+ }
+ av_write_frame( avformatEncoder, &avpacketEncoder );
++#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
++ url_close_buf( avformatEncoder->pb );
++#else
+ url_close_buf( &avformatEncoder->pb );
++#endif
+
+ // Update this frame's metadata
+ ExtractHeader();



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (0798ab0d137cf1c4fc869d2e90aaf472a298d9d9), Arwed von Merkatz, 12/09/2007

Archive powered by MHonArc 2.6.24.

Top of Page