[asterisk-commits] branch mogorman/asterisk-xmpp r10658 - in /team/mogorman/asterisk-xmpp: ./ fo...

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Tue Feb 21 13:21:05 2006
New Revision: 10658

URL: http://svn.digium.com/view/asterisk?rev=10658&view=rev
Log:
Merged revisions 10627,10656 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r10627 | kpfleming | 2006-02-21 11:15:17 -0600 (Tue, 21 Feb 2006) | 2 lines

set keywords property correctly

........
r10656 | russell | 2006-02-21 13:20:30 -0600 (Tue, 21 Feb 2006) | 2 lines

suppress some compiler warnings due to recent format changes to use off_t

........

Modified:
    team/mogorman/asterisk-xmpp/   (props changed)
    team/mogorman/asterisk-xmpp/formats/format_h264.c
    team/mogorman/asterisk-xmpp/funcs/func_channel.c   (props changed)

Propchange: team/mogorman/asterisk-xmpp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 21 13:21:05 2006
@@ -1,1 +1,1 @@
-/trunk:1-10610
+/trunk:1-10656

Modified: team/mogorman/asterisk-xmpp/formats/format_h264.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/formats/format_h264.c?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/formats/format_h264.c (original)
+++ team/mogorman/asterisk-xmpp/formats/format_h264.c Tue Feb 21 13:21:05 2006
@@ -221,7 +221,7 @@
 	return NULL;
 }
 
-static int h264_seek(struct ast_filestream *fs, long sample_offset, int whence)
+static int h264_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
 {
 	/* No way Jose */
 	return -1;
@@ -235,7 +235,7 @@
 	return 0;
 }
 
-static long h264_tell(struct ast_filestream *fs)
+static off_t h264_tell(struct ast_filestream *fs)
 {
 	/* XXX This is totally bogus XXX */
 	off_t offset;

Propchange: team/mogorman/asterisk-xmpp/funcs/func_channel.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Feb 21 13:21:05 2006
@@ -1,1 +1,1 @@
-Author Date Id Revision
+Author Id Date Revision

Propchange: team/mogorman/asterisk-xmpp/funcs/func_channel.c
            ('svn_keywords' removed)