diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2011-11-14 09:30:17 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-11-14 09:30:17 +0000 |
| commit | 491b8d88cba9cd56e7ebdca070937b0ecb986f32 (patch) | |
| tree | 2412974fdeac5aacac3474fcb65f1cd7d07cd773 /media-gfx | |
| parent | Fixing bug 389851 by converting script to python2. (diff) | |
| download | gentoo-2-491b8d88cba9cd56e7ebdca070937b0ecb986f32.tar.gz gentoo-2-491b8d88cba9cd56e7ebdca070937b0ecb986f32.tar.bz2 gentoo-2-491b8d88cba9cd56e7ebdca070937b0ecb986f32.zip | |
Rework the libav-0.7 patch to copy the filename
(Portage version: 2.1.10.34/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/blender/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.60a-libav-0.7.patch | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 808739dcec57..61ab9d46d193 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.215 2011/11/13 22:54:25 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.216 2011/11/14 09:30:17 lu_zero Exp $ + + 14 Nov 2011; Luca Barbato <lu_zero@gentoo.org> + files/blender-2.60a-libav-0.7.patch: + Rework the libav-0.7 support to copy the filename 13 Nov 2011; Sebastian Pipping <sping@gentoo.org> files/blender-2.57-insecure.desktop, files/blender-2.60a-insecure.desktop: diff --git a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch b/media-gfx/blender/files/blender-2.60a-libav-0.7.patch index 9bf321649036..3bae020a02ae 100644 --- a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch +++ b/media-gfx/blender/files/blender-2.60a-libav-0.7.patch @@ -1,14 +1,15 @@ --- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-10-24 20:09:01.000000000 +0200 +++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-11-13 12:34:01.000000000 +0100 -@@ -40,6 +40,7 @@ +@@ -40,6 +40,8 @@ #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> #include <libavformat/avio.h> +#include <libavutil/mathematics.h> ++#include <libavutil/avstring.h> #include "ffmpeg_compat.h" } -@@ -57,10 +58,14 @@ +@@ -57,10 +58,15 @@ { static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" }; @@ -18,7 +19,8 @@ + if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error); - m_outputFmt = m_formatCtx->oformat; -+ m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL); ++ av_strlcpy(m_formatCtx->filename, filename.c_str(), sizeof(m_formatCtx->filename)); ++ m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL); + if (!m_outputFmt) { + avformat_free_context(m_formatCtx); + AUD_THROW(AUD_ERROR_FFMPEG, context_error); |