--- konference-0.1/src/sip/sipfsm.h~	2005-04-22 03:22:41.000000000 +0200
+++ konference-0.1/src/sip/sipfsm.h	2006-12-15 06:20:21.000000000 +0100
@@ -566,7 +566,7 @@ bool SocketOpenedOk() { return sipSocket
 	SipWatcher *CreateWatcherFsm(QString Url);
 	SipIM *CreateIMFsm(QString Url="", QString callIdStr="");
 	void StopWatchers();
-	void SipFsm::KickWatcher(SipUrl *Url);
+	void KickWatcher(SipUrl *Url);
 	void SendIM(QString destUrl, QString CallId, QString imMsg);
 	int numCalls();
 	int getPrimaryCall() { return primaryCall; };
--- konference-0.1/src/codecs/h263.cpp~	2005-04-19 14:03:18.000000000 +0200
+++ konference-0.1/src/codecs/h263.cpp	2006-12-15 06:22:16.000000000 +0100
@@ -60,8 +60,8 @@ bool H263Container::H263StartEncoder(int
 	h263EncContext->width = w;
 	h263EncContext->height = h;
 	/* frames per second */
-	h263EncContext->frame_rate = fps;
-	h263EncContext->frame_rate_base= 1;
+/*	h263EncContext->frame_rate = fps;
+	h263EncContext->frame_rate_base= 1;*/
 	h263EncContext->gop_size = fps*5; /* emit one intra frame every five secs */
 	h263EncContext->max_b_frames=0;