Mercurial > mplayer.hg

changeset 31923:8c6e90c5fcc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless casts.
author reimar
date Sat, 21 Aug 2010 11:36:18 +0000
parents 4ed75340d779
children 8d7f15885b64
files mencoder.c mplayer.c
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Sat Aug 21 11:33:33 2010 +0000
+++ b/mencoder.c	Sat Aug 21 11:36:18 2010 +0000
@@ -1033,7 +1033,7 @@
       char* vf_arg[] = {"auto", "1", NULL};
       vf_instance_t* vf_ass = vf_open_filter(sh_video->vfilter,"ass",vf_arg);
       if (vf_ass)
-        sh_video->vfilter=(void*)vf_ass;
+        sh_video->vfilter=vf_ass;
       else
         mp_msg(MSGT_CPLAYER,MSGL_ERR, "ASS: cannot add video filter\n");
     }
--- a/mplayer.c	Sat Aug 21 11:33:33 2010 +0000
+++ b/mplayer.c	Sat Aug 21 11:36:18 2010 +0000
@@ -2285,7 +2285,7 @@
   current_module="init_video_filters";
   {
     char* vf_arg[] = { "_oldargs_", (char*)mpctx->video_out , NULL };
-    sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",vf_arg);
+    sh_video->vfilter=vf_open_filter(NULL,"vo",vf_arg);
   }
 #ifdef CONFIG_MENU
   if(use_menu) {
@@ -2297,7 +2297,7 @@
     }
   }
   if(vf_menu)
-    sh_video->vfilter=(void*)vf_menu;
+    sh_video->vfilter=vf_menu;
 #endif
 
 #ifdef CONFIG_ASS
@@ -2314,14 +2314,14 @@
       char* vf_arg[] = {"auto", "1", NULL};
       vf_instance_t* vf_ass = vf_open_filter(sh_video->vfilter,"ass",vf_arg);
       if (vf_ass)
-        sh_video->vfilter=(void*)vf_ass;
+        sh_video->vfilter=vf_ass;
       else
         mp_msg(MSGT_CPLAYER,MSGL_ERR, "ASS: cannot add video filter\n");
     }
   }
 #endif
 
-  sh_video->vfilter=(void*)append_filters(sh_video->vfilter);
+  sh_video->vfilter=append_filters(sh_video->vfilter);
 
 #ifdef CONFIG_ASS
   if (ass_enabled)