diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-11-21 06:06:46 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-11-21 06:06:46 +0000 |
| commit | fac20d5893392674d89846619e9d1f4717a92461 (patch) | |
| tree | b0e38fcdc57633fe271e759d7e992d687d80962e /multimedia/libdv/files | |
| parent | 3a86bb925d5de09eb87cb0893d7371e059729200 (diff) | |
Notes
Diffstat (limited to 'multimedia/libdv/files')
| -rw-r--r-- | multimedia/libdv/files/patch-playdv:display.c | 20 | ||||
| -rw-r--r-- | multimedia/libdv/files/patch-playdv:display.h | 13 |
2 files changed, 27 insertions, 6 deletions
diff --git a/multimedia/libdv/files/patch-playdv:display.c b/multimedia/libdv/files/patch-playdv:display.c index 02b0a85c5446..37e672dab698 100644 --- a/multimedia/libdv/files/patch-playdv:display.c +++ b/multimedia/libdv/files/patch-playdv:display.c @@ -1,29 +1,37 @@ ---- playdv/display.c.orig Sun Jun 24 13:06:30 2001 -+++ playdv/display.c Mon Nov 19 00:37:55 2001 +--- playdv/display.c.orig Wed Nov 21 03:47:29 2001 ++++ playdv/display.c Wed Nov 21 03:51:04 2001 @@ -47,6 +47,8 @@ #include <popt.h> #endif -+dv_display_t *dv_dpy_on_exit_hack; ++dv_display_t *dv_dpy_on_exit_hack = NULL; + static int dv_display_SDL_init(dv_display_t *dv_dpy, gchar *w_name, gchar *i_name ); static gboolean dv_display_gdk_init(dv_display_t *dv_dpy, gint *argc, gchar ***argv ); -@@ -675,6 +677,13 @@ +@@ -257,6 +259,7 @@ + } /* switch */ + + free(dv_dpy); ++ dv_dpy_on_exit_hack = NULL; + } /* dv_display_exit */ + + static gboolean +@@ -675,6 +678,13 @@ } /* if */ } /* dv_display_exit_handler */ +static void +dv_display_on_exit_hack_handler() +{ -+ if(dv_dpy_on_exit_hack) { ++ if(dv_dpy_on_exit_hack != NULL) { + dv_display_exit(dv_dpy_on_exit_hack); + } /* if */ +} /* dv_display_exit_handler */ gboolean dv_display_init(dv_display_t *dv_dpy, gint *argc, gchar ***argv, gint width, gint height, -@@ -804,7 +813,8 @@ +@@ -804,7 +814,8 @@ fprintf(stderr, " Using gtk for display\n"); ok: diff --git a/multimedia/libdv/files/patch-playdv:display.h b/multimedia/libdv/files/patch-playdv:display.h new file mode 100644 index 000000000000..a734cd14f6c5 --- /dev/null +++ b/multimedia/libdv/files/patch-playdv:display.h @@ -0,0 +1,13 @@ +--- playdv/display.h.orig Sun Jun 24 13:06:30 2001 ++++ playdv/display.h Wed Nov 21 03:52:21 2001 +@@ -38,8 +38,8 @@ + #endif // HAVE_LIBXV + + #if HAVE_SDL +-#include <SDL/SDL.h> +-#include <SDL/SDL_syswm.h> ++#include <SDL.h> ++#include <SDL_syswm.h> + #endif // HAVE_SDL + + #if HAVE_GTK |