[asterisk-commits] rizzo: branch rizzo/video_v2 r85446 - /team/rizzo/video_v2/channels/

[SVN commits to the Asterisk project]

Author: rizzo
Date: Thu Oct 11 12:29:00 2007
New Revision: 85446

URL: http://svn.digium.com/view/asterisk?view=rev&rev=85446
Log:
fix packetization not on byte boundaries.


Modified:
    team/rizzo/video_v2/channels/console_video.c

Modified: team/rizzo/video_v2/channels/console_video.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/video_v2/channels/console_video.c?view=diff&rev=85446&r1=85445&r2=85446
==============================================================================
--- team/rizzo/video_v2/channels/console_video.c (original)
+++ team/rizzo/video_v2/channels/console_video.c Thu Oct 11 12:29:00 2007
@@ -356,7 +356,7 @@
 		mask = (1 << b->ebit) - 1;
 		/* update the last byte in the buffer */
 		dst[-1] &= ~mask;	/* clear bits to ignore */
-		dst[-1] |= (*src | mask);	/* append new bits */
+		dst[-1] |= (*src & mask);	/* append new bits */
 		src += 1;	/* skip and prepare for common block */
 		len --;
 	} else {	/* must shift the new block, not done yet */
@@ -965,7 +965,7 @@
 		i = len;	/* wrong... */
 #else
 		int found = 0, found_ebit = 0;	/* last GBSC position found */
-		for (; i < len - 1 ; i++) {
+		for (; i < len ; i++) {
 			uint8_t x, rpos, lpos;
 			if (d[i] != 0)		/* cannot be in a GBSC */
 				continue;