[Iaxclient-cvs] SF.net SVN: iaxclient: [1114] trunk

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

Revision: 1114
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1114&view=rev
Author:   jpgrayson
Date:     2007-09-03 12:21:53 -0700 (Mon, 03 Sep 2007)

Log Message:
-----------
Remove some remnant references to vss_h264.

Modified Paths:
--------------
    trunk/lib/video.c
    trunk/simpleclient/videotest/Makefile

Modified: trunk/lib/video.c
===================================================================
--- trunk/lib/video.c	2007-09-03 19:14:08 UTC (rev 1113)
+++ trunk/lib/video.c	2007-09-03 19:21:53 UTC (rev 1114)
@@ -26,9 +26,6 @@
 #ifdef USE_THEORA
 #include "codec_theora.h"
 #endif
-#ifdef USE_H264_VSS
-#include "codec_h264_vss.h"
-#endif
 
 #define VIDEO_BUFSIZ (1<<19)
 
@@ -190,11 +187,6 @@
 		real_pref = preferred;
 #endif
 
-#ifdef USE_H264_VSS
-	if ( preferred & IAXC_FORMAT_H264 )
-		real_pref = IAXC_FORMAT_H264;
-#endif
-
 	if ( !real_pref )
 	{
 		// If preferred codec is not available switch to the
@@ -224,11 +216,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");
@@ -253,9 +240,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;
 		}
 	}
@@ -339,14 +323,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,

Modified: trunk/simpleclient/videotest/Makefile
===================================================================
--- trunk/simpleclient/videotest/Makefile	2007-09-03 19:14:08 UTC (rev 1113)
+++ trunk/simpleclient/videotest/Makefile	2007-09-03 19:21:53 UTC (rev 1114)
@@ -4,7 +4,6 @@
 AMR=0
 AMR_WB=0
 USE_FFMPEG=0
-USE_H264_VSS=0
 
 CFLAGS= -I../../lib -I../../lib/videoLib -I../../lib/libiax2/src -I../../lib/gsm/inc -I../../lib/portaudio/pa_common -I../../lib/portaudio/pablio -Iinclude `sdl-config --cflags` -I../../lib/ogg/include -I../../lib/theora/include -I../../lib/SDL/include
 
@@ -85,14 +84,6 @@
 	CFLAGS:= $(CFLAGS) -DUSE_FFMPEG
 endif
 
-ifeq ($(USE_H264_VSS),1)
-	CFLAGS:= $(CFLAGS) -DUSE_H264_VSS
-	LIBS:= $(LIBS) -L../../lib/vssh_sdk/lib -lvsshdec -lvsshenc -lvsshprep -lvsshcsp -lvsshcom
-	ifeq ($(OSTYPE),LINUX)
-		LIBS:= $(LIBS) -limf -lirc
-	endif
-endif
-
 ifeq ($(OSTYPEREAL),FREEBSD)
 MAKE=gmake
 else


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