[gentoo-commits] gentoo-x86 commit in media-video/cinelerra/files: cinelerra-x264.patch

[Alexis Ballier (aballier)]

aballier    09/10/26 13:30:53

  Added:                cinelerra-x264.patch
  Log:
  add a patch to fix exporting in h264 with latest x264
  (Portage version: 2.2_rc46/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-video/cinelerra/files/cinelerra-x264.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/files/cinelerra-x264.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/files/cinelerra-x264.patch?rev=1.1&content-type=text/plain

Index: cinelerra-x264.patch
===================================================================
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)