diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-10-26 13:30:53 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-10-26 13:30:53 +0000 |
| commit | 5c3308a5cd068657ad47bf182a797eb9d8b81722 (patch) | |
| tree | c93d24d8eb5744a1d5910ffecdd8e0bd53df3054 /media-video/cinelerra | |
| parent | amd64 stable wrt #290487 (diff) | |
| download | gentoo-2-5c3308a5cd068657ad47bf182a797eb9d8b81722.tar.gz gentoo-2-5c3308a5cd068657ad47bf182a797eb9d8b81722.tar.bz2 gentoo-2-5c3308a5cd068657ad47bf182a797eb9d8b81722.zip | |
add a patch to fix exporting in h264 with latest x264
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'media-video/cinelerra')
| -rw-r--r-- | media-video/cinelerra/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/cinelerra/cinelerra-20090210.ebuild | 3 | ||||
| -rw-r--r-- | media-video/cinelerra/files/cinelerra-x264.patch | 20 |
3 files changed, 27 insertions, 2 deletions
diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog index cdd6519852a0..372215033242 100644 --- a/media-video/cinelerra/ChangeLog +++ b/media-video/cinelerra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/cinelerra # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.37 2009/09/22 06:02:40 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.38 2009/10/26 13:30:53 aballier Exp $ + + 26 Oct 2009; Alexis Ballier <aballier@gentoo.org> + +files/cinelerra-x264.patch, cinelerra-20090210.ebuild: + add a patch to fix exporting in h264 with latest x264 22 Sep 2009; Alexis Ballier <aballier@gentoo.org> -cinelerra-20080717.ebuild, -files/cinelerra-ffmpeg.patch: diff --git a/media-video/cinelerra/cinelerra-20090210.ebuild b/media-video/cinelerra/cinelerra-20090210.ebuild index 76b9e56c176f..f0dbf52b7912 100644 --- a/media-video/cinelerra/cinelerra-20090210.ebuild +++ b/media-video/cinelerra/cinelerra-20090210.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20090210.ebuild,v 1.3 2009/09/09 10:04:48 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20090210.ebuild,v 1.4 2009/10/26 13:30:53 aballier Exp $ inherit autotools multilib eutils @@ -59,6 +59,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${PN}-libavutil50.patch" epatch "${FILESDIR}/${PN}-pkgconfig-x264.patch" + epatch "${FILESDIR}/${PN}-x264.patch" AT_M4DIR="m4" eautoreconf } diff --git a/media-video/cinelerra/files/cinelerra-x264.patch b/media-video/cinelerra/files/cinelerra-x264.patch new file mode 100644 index 000000000000..018b964e12d9 --- /dev/null +++ b/media-video/cinelerra/files/cinelerra-x264.patch @@ -0,0 +1,20 @@ +Index: cinelerra-20090210/quicktime/qth264.c +=================================================================== +--- cinelerra-20090210.orig/quicktime/qth264.c ++++ cinelerra-20090210/quicktime/qth264.c +@@ -239,10 +239,15 @@ static int encode(quicktime_t *file, uns + codec->buffer_size = 0; + for(i = 0; i < nnal; i++) + { ++#if X264_BUILD >= 76 ++ int size = nals[i].i_payload; ++ memcpy(codec->work_buffer + codec->buffer_size, nals[i].p_payload, nals[i].i_payload); ++#else + int size = x264_nal_encode(codec->work_buffer + codec->buffer_size, + &allocation, + 1, + nals + i); ++#endif + unsigned char *ptr = codec->work_buffer + codec->buffer_size; + + if(size > 0) |