Attachment #56248 for bug #84916

View | Details | Raw Unified | Return to bug 84916
Collapse All | Expand All

Lines 6-13 Link Here

(-)Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= transcode	8	PORTNAME= transcode
9	DISTVERSION= 1.0.0rc1	9	DISTVERSION= 1.0.0
10	PORTREVISION= 1
11	CATEGORIES= multimedia	10	CATEGORIES= multimedia
12	MASTER_SITES= http://dl.fkb.wormulon.net/transcode/ \	11	MASTER_SITES= http://dl.fkb.wormulon.net/transcode/ \
13	http://dl.kel.wormulon.net/transcode/ \	12	http://dl.kel.wormulon.net/transcode/ \
Lines 415-421 Link Here
415	${WRKSRC}/import/decode_mov.c \	414	${WRKSRC}/import/decode_mov.c \
416	${WRKSRC}/import/import_mov.c \	415	${WRKSRC}/import/import_mov.c \
417	${WRKSRC}/import/probe_mov.c	416	${WRKSRC}/import/probe_mov.c
418		417
419	post-install:	418	post-install:
420	.if defined(WITH_XVID)	419	.if defined(WITH_XVID)
421	@${LN} -sf ${LOCALBASE}/lib/libxvidcore.so \	420	@${LN} -sf ${LOCALBASE}/lib/libxvidcore.so \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (transcode-1.0.0rc1.tar.gz) = bda8422a8b2fb83e5c750743b688b7a3	1	MD5 (transcode-1.0.0.tar.gz) = 28990470fb92a28e351cb96bcad0c890
2	SIZE (transcode-1.0.0rc1.tar.gz) = 2349974	2	SIZE (transcode-1.0.0.tar.gz) = 2347710




--- import/af6_decore.cpp.orig	Sun Jul  3 17:03:28 2005
+++ import/af6_decore.cpp	Sun Jul  3 17:03:48 2005
@@ -213,7 +213,7 @@
 
       /* send sync token */
       fflush(stdout);
-      p_write(decode->fd_out, sync_str, sizeof(sync_str));
+      p_write(decode->fd_out, (uint8_t*)sync_str, sizeof(sync_str));
 
       /* frame serve loop */
       /* by default decode->frame_limit[0]=0 and ipipe->frame_limit[1]=LONG_MAX so all frames are decoded */
@@ -268,13 +268,13 @@
 		    }
 		  }
 		  /* write unpacked frame */
-		  if(p_write(decode->fd_out, pack_buffer, pack_size)!= pack_size) {
+		  if(p_write(decode->fd_out, (uint8_t*)pack_buffer, pack_size)!= pack_size) {
 		    fprintf(stderr,"(%s) ERROR: Pipe write error!\n",__FILE__);
 		    break;
 		  }
 		} else {
 		  /* directly write raw frame */
-		  if(p_write(decode->fd_out, buf, buffer_size)!= buffer_size) {
+		  if(p_write(decode->fd_out, (uint8_t*)buf, buffer_size)!= buffer_size) {
 		    fprintf(stderr,"(%s) ERROR: Pipe write error!\n",__FILE__);
 		    break;
 		  }
@@ -368,7 +368,7 @@
 
       /* send sync token */
       fflush(stdout);
-      p_write(decode->fd_out, sync_str, sizeof(sync_str));
+      p_write(decode->fd_out, (uint8_t*)sync_str, sizeof(sync_str));
       
       /* sample server loop */
       while(!ars->Eof()) { 
@@ -393,18 +393,18 @@
 	{
 		if ( s_byte_read - ret_size <(unsigned int)decode->frame_limit[0])
 		{
-			if((unsigned int)p_write(decode->fd_out,buffer+(ret_size-(s_byte_read-decode->frame_limit[0])),(s_byte_read-decode->frame_limit[0]))!=(unsigned int)(s_byte_read-decode->frame_limit[0])) 
+			if((unsigned int)p_write(decode->fd_out,(uint8_t*)(buffer+(ret_size-(s_byte_read-decode->frame_limit[0]))),(s_byte_read-decode->frame_limit[0]))!=(unsigned int)(s_byte_read-decode->frame_limit[0])) 
 			  	break;
 		}
 		else
 		{
-			if((unsigned int)p_write(decode->fd_out,buffer,ret_size)!=ret_size) 
+			if((unsigned int)p_write(decode->fd_out,(uint8_t*)buffer,ret_size)!=ret_size) 
 			  break;
 		}
 	}
 	else if ((s_byte_read> decode->frame_limit[0]) && (s_byte_read - ret_size <=(unsigned int)decode->frame_limit[1]))
 	{
-		if((unsigned int)p_write(decode->fd_out,buffer,(s_byte_read-decode->frame_limit[1]))!=(unsigned int)(s_byte_read-decode->frame_limit[1])) 
+		if((unsigned int)p_write(decode->fd_out,(uint8_t*)buffer,(s_byte_read-decode->frame_limit[1]))!=(unsigned int)(s_byte_read-decode->frame_limit[1])) 
 		 	break;
 	}
 	else if (s_byte_read - ret_size >(unsigned int)decode->frame_limit[1])

Return to bug 84916

Removed Link Here

(-)files/patch-import:af6_decore.cpp (-58 lines)
1	--- import/af6_decore.cpp.orig Sun Jul 3 17:03:28 2005
2	+++ import/af6_decore.cpp Sun Jul 3 17:03:48 2005
3	@@ -213,7 +213,7 @@
4
5	/* send sync token */
6	fflush(stdout);
7	- p_write(decode->fd_out, sync_str, sizeof(sync_str));
8	+ p_write(decode->fd_out, (uint8_t*)sync_str, sizeof(sync_str));
9
10	/* frame serve loop */
11	/* by default decode->frame_limit[0]=0 and ipipe->frame_limit[1]=LONG_MAX so all frames are decoded */
12	@@ -268,13 +268,13 @@
13	}
14	}
15	/* write unpacked frame */
16	- if(p_write(decode->fd_out, pack_buffer, pack_size)!= pack_size) {
17	+ if(p_write(decode->fd_out, (uint8_t*)pack_buffer, pack_size)!= pack_size) {
18	fprintf(stderr,"(%s) ERROR: Pipe write error!\n",__FILE__);
19	break;
20	}
21	} else {
22	/* directly write raw frame */
23	- if(p_write(decode->fd_out, buf, buffer_size)!= buffer_size) {
24	+ if(p_write(decode->fd_out, (uint8_t*)buf, buffer_size)!= buffer_size) {
25	fprintf(stderr,"(%s) ERROR: Pipe write error!\n",__FILE__);
26	break;
27	}
28	@@ -368,7 +368,7 @@
29
30	/* send sync token */
31	fflush(stdout);
32	- p_write(decode->fd_out, sync_str, sizeof(sync_str));
33	+ p_write(decode->fd_out, (uint8_t*)sync_str, sizeof(sync_str));
34
35	/* sample server loop */
36	while(!ars->Eof()) {
37	@@ -393,18 +393,18 @@
38	{
39	if ( s_byte_read - ret_size <(unsigned int)decode->frame_limit[0])
40	{
41	- if((unsigned int)p_write(decode->fd_out,buffer+(ret_size-(s_byte_read-decode->frame_limit[0])),(s_byte_read-decode->frame_limit[0]))!=(unsigned int)(s_byte_read-decode->frame_limit[0]))
42	+ if((unsigned int)p_write(decode->fd_out,(uint8_t*)(buffer+(ret_size-(s_byte_read-decode->frame_limit[0]))),(s_byte_read-decode->frame_limit[0]))!=(unsigned int)(s_byte_read-decode->frame_limit[0]))
43	break;
44	}
45	else
46	{
47	- if((unsigned int)p_write(decode->fd_out,buffer,ret_size)!=ret_size)
48	+ if((unsigned int)p_write(decode->fd_out,(uint8_t*)buffer,ret_size)!=ret_size)
49	break;
50	}
51	}
52	else if ((s_byte_read> decode->frame_limit[0]) && (s_byte_read - ret_size <=(unsigned int)decode->frame_limit[1]))
53	{
54	- if((unsigned int)p_write(decode->fd_out,buffer,(s_byte_read-decode->frame_limit[1]))!=(unsigned int)(s_byte_read-decode->frame_limit[1]))
55	+ if((unsigned int)p_write(decode->fd_out,(uint8_t*)buffer,(s_byte_read-decode->frame_limit[1]))!=(unsigned int)(s_byte_read-decode->frame_limit[1]))
56	break;
57	}
58	else if (s_byte_read - ret_size >(unsigned int)decode->frame_limit[1])