Mercurial > mplayer.hg

diff gui/mplayer/gtk/opts.c @ 32741:872b714d47bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cast properly (to avoid compiler warnings).
author ib
date Sat, 29 Jan 2011 16:39:52 +0000
parents fbe5c829c69b
children 6e22bcc85ac5
line wrap: on
line diff
--- a/gui/mplayer/gtk/opts.c	Sat Jan 29 15:13:55 2011 +0000
+++ b/gui/mplayer/gtk/opts.c	Sat Jan 29 16:39:52 2011 +0000
@@ -1557,33 +1557,33 @@
     case 1:
 #ifdef CONFIG_OSS_AUDIO
       if (strncmp(ao_driver[0], "oss", 3) == 0) {
-        gfree(&gtkAOOSSDevice);
+        gfree((void **) &gtkAOOSSDevice);
         gtkAOOSSDevice = gstrdup(getGtkEntryText(CEAudioDevice));
-        gfree(&gtkAOOSSMixer);
+        gfree((void **) &gtkAOOSSMixer);
         gtkAOOSSMixer = gstrdup(getGtkEntryText(CEAudioMixer));
-        gfree(&gtkAOOSSMixerChannel);
+        gfree((void **) &gtkAOOSSMixerChannel);
         gtkAOOSSMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
       }
 #endif
 #ifdef CONFIG_ALSA
       if (strncmp(ao_driver[0], "alsa", 4) == 0) {
-        gfree(&gtkAOALSADevice);
+        gfree((void **) &gtkAOALSADevice);
         gtkAOALSADevice = gstrdup(getGtkEntryText(CEAudioDevice));
-        gfree(&gtkAOALSAMixer);
+        gfree((void **) &gtkAOALSAMixer);
         gtkAOALSAMixer = gstrdup(getGtkEntryText(CEAudioMixer));
-        gfree(&gtkAOALSAMixerChannel);
+        gfree((void **) &gtkAOALSAMixerChannel);
         gtkAOALSAMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
       }
 #endif
 #ifdef CONFIG_SDL
       if (strncmp(ao_driver[0], "sdl", 3) == 0) {
-        gfree(&gtkAOSDLDriver);
+        gfree((void **) &gtkAOSDLDriver);
         gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice));
       }
 #endif
 #ifdef CONFIG_ESD
       if (strncmp(ao_driver[0], "esd", 3) == 0) {
-        gfree(&gtkAOESDDevice);
+        gfree((void **) &gtkAOESDDevice);
         gtkAOESDDevice = gstrdup(getGtkEntryText(CEAudioDevice));
       }
 #endif