diff options
Diffstat (limited to 'client_examples')
| -rw-r--r-- | client_examples/gtkvncviewer.c | 16 | ||||
| -rw-r--r-- | client_examples/vnc2mpg.c | 6 |
2 files changed, 3 insertions, 19 deletions
diff --git a/client_examples/gtkvncviewer.c b/client_examples/gtkvncviewer.c index 861e4e3..bfe625e 100644 --- a/client_examples/gtkvncviewer.c +++ b/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) { diff --git a/client_examples/vnc2mpg.c b/client_examples/vnc2mpg.c index 10c3d3e..af4a73a 100644 --- a/client_examples/vnc2mpg.c +++ b/client_examples/vnc2mpg.c @@ -85,11 +85,11 @@ AVStream *add_video_stream(AVFormatContext *oc, int codec_id, int w, int h) } if (c->codec_id == CODEC_ID_MPEG1VIDEO){ /* needed to avoid using macroblocks in which some coeffs overflow - this doesnt happen with normal video, it just happens here as the - motion of the chroma plane doesnt match the luma plane */ + this doesn't happen with normal video, it just happens here as the + motion of the chroma plane doesn't match the luma plane */ c->mb_decision=2; } - /* some formats want stream headers to be seperate */ + /* some formats want stream headers to be separate */ if(!strcmp(oc->oformat->name, "mp4") || !strcmp(oc->oformat->name, "mov") || !strcmp(oc->oformat->name, "3gp")) c->flags |= CODEC_FLAG_GLOBAL_HEADER; |