[Iaxclient-cvs] SF.net SVN: iaxclient: [1199] branches/2.0/lib/video.c

[<jpg...@us...>]

Revision: 1199
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1199&view=rev
Author:   jpgrayson
Date:     2007-10-16 07:45:13 -0700 (Tue, 16 Oct 2007)

Log Message:
-----------
Remove references to commercial vss h264 codec.

Modified Paths:
--------------
    branches/2.0/lib/video.c

Modified: branches/2.0/lib/video.c
===================================================================
--- branches/2.0/lib/video.c	2007-10-16 14:42:57 UTC (rev 1198)
+++ branches/2.0/lib/video.c	2007-10-16 14:45:13 UTC (rev 1199)
@@ -24,9 +24,6 @@
 #include "codec_ffmpeg.h"
 #endif
 #include "codec_theora.h"
-#ifdef USE_H264_VSS
-#include "codec_h264_vss.h"
-#endif
 
 #define VIDEO_BUFSIZ (1<<19)
 
@@ -222,11 +219,6 @@
 	}
 #endif
 
-#ifdef USE_H264_VSS
-	if ( allowed & IAXC_FORMAT_H264 )
-		real_allowed |= IAXC_FORMAT_H264;
-#endif
-
 	if ( !real_pref )
 	{
 		fprintf(stderr, "Audio-only client!\n");
@@ -251,9 +243,6 @@
 				| IAXC_FORMAT_MPEG4
 				| IAXC_FORMAT_H264;
 #endif
-#ifdef USE_H264_VSS
-			iaxc_video_format_allowed |= IAXC_FORMAT_H264;
-#endif
 			iaxc_video_format_allowed |= IAXC_FORMAT_THEORA;
 		}
 	}
@@ -337,14 +326,6 @@
 #endif
 
 	case IAXC_FORMAT_H264:
-#ifdef USE_H264_VSS
-		return codec_video_h264_new(format,
-				iaxc_video_width,
-				iaxc_video_height,
-				iaxc_video_framerate,
-				iaxc_video_bitrate,
-				iaxc_video_fragsize);
-#endif
 #ifdef USE_FFMPEG
 		return codec_video_ffmpeg_new(format,
 				iaxc_video_width,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.