Revert "LibVNCClient: Add H.264 encoding for framebuffer updates"

This reverts commit d891478.

Conflicts:
	configure.ac
	libvncclient/h264.c

client_examples/gtkvncviewer.c

@@ -23,10 +23,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <rfb/rfbclient.h>
 
-#ifdef LIBVNCSERVER_CONFIG_LIBVA
-#include <gdk/gdkx.h>
-#endif
-
 static rfbClient *cl;
 static gchar *server_cut_text = NULL;
 static gboolean framebuffer_allocated = FALSE;
@@ -61,14 +57,6 @@ static gboolean expose_event (GtkWidget      *widget,
 		cl->format.greenMax = (1 << image->visual->green_prec) - 1;
 		cl->format.blueMax  = (1 << image->visual->blue_prec) - 1;
 
-#ifdef LIBVNCSERVER_CONFIG_LIBVA
-		/* Allow libvncclient to use a more efficient way
-		 * of putting the framebuffer on the screen when
-		 * using the H.264 format.
-		 */
-		cl->outputWindow = GDK_WINDOW_XID(widget->window);
-#endif
-
 		SetFormatAndEncodings (cl);
 
 		framebuffer_allocated = TRUE;
@@ -79,14 +67,12 @@ static gboolean expose_event (GtkWidget      *widget,
 		gdk_cursor_unref( cur );
 	}
 
-#ifndef LIBVNCSERVER_CONFIG_LIBVA
 	gdk_draw_image (GDK_DRAWABLE (widget->window),
 	                widget->style->fg_gc[gtk_widget_get_state(widget)],
 	                image,
 	                event->area.x, event->area.y,
 	                event->area.x, event->area.y,
 	                event->area.width, event->area.height);
-#endif
 
 	return FALSE;
 }
@@ -476,12 +462,10 @@ static void update (rfbClient *cl, int x, int y, int w, int h) {
 		dialog_connecting = NULL;
 	}
 
-#ifndef LIBVNCSERVER_CONFIG_LIBVA
 	GtkWidget *drawing_area = rfbClientGetClientData (cl, gtk_init);
 
 	if (drawing_area != NULL)
 		gtk_widget_queue_draw_area (drawing_area, x, y, w, h);
-#endif
 }
 
 static void kbd_leds (rfbClient *cl, int value, int pad) {

configure.ac

@@ -149,18 +149,6 @@ AC_SUBST(SSL_LIBS)
 AM_CONDITIONAL(HAVE_LIBSSL, test ! -z "$SSL_LIBS")
 
 
-# See if we want libva support
-AH_TEMPLATE(CONFIG_LIBVA, [Build libva support])
-AC_ARG_WITH(libva,
-[  --without-libva         disable support for libva],,)
-if test "x$with_libva" != "xno"; then
-    AC_CHECK_LIB(va-x11, vaGetDisplay,
-        VA_LIBS="-lva -lva-x11"
-        [AC_DEFINE(CONFIG_LIBVA) CONFIG_LIBVA="true"], ,)
-fi
-AC_SUBST(VA_LIBS)
-AM_CONDITIONAL(CONFIG_LIBVA, test ! -z "$VA_LIBS")
-
 
 
 AC_ARG_WITH(jpeg,

libvncclient/Makefile.am

@@ -14,7 +14,7 @@ endif
 
 
 libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c ../common/minilzo.c $(TLSSRCS)
-libvncclient_la_LIBADD=$(TLSLIBS) $(VA_LIBS)
+libvncclient_la_LIBADD=$(TLSLIBS)
 
 noinst_HEADERS=../common/lzodefs.h ../common/lzoconf.h ../common/minilzo.h tls.h