Mercurial > mplayer.hg

changeset 32229:e7cd36fc291e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not falsely declare some vo_functions_t declarations as const. Also add a comment so this mistake is not repeated.
author diego
date Mon, 20 Sep 2010 07:33:53 +0000
parents 2322028e1b45
children e12d7b8e3835
files libvo/video_out.c
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/video_out.c	Mon Sep 20 07:21:17 2010 +0000
+++ b/libvo/video_out.c	Mon Sep 20 07:33:53 2010 +0000
@@ -93,7 +93,6 @@
 extern const vo_functions_t video_out_mga;
 extern const vo_functions_t video_out_xmga;
 extern const vo_functions_t video_out_x11;
-extern const vo_functions_t video_out_xover;
 extern const vo_functions_t video_out_xvmc;
 extern const vo_functions_t video_out_vdpau;
 extern const vo_functions_t video_out_xv;
@@ -111,9 +110,7 @@
 extern const vo_functions_t video_out_zr;
 extern const vo_functions_t video_out_zr2;
 extern const vo_functions_t video_out_bl;
-extern const vo_functions_t video_out_fbdev;
 extern const vo_functions_t video_out_fbdev2;
-extern const vo_functions_t video_out_svga;
 extern const vo_functions_t video_out_png;
 extern const vo_functions_t video_out_ggi;
 extern const vo_functions_t video_out_aa;
@@ -129,12 +126,8 @@
 extern const vo_functions_t video_out_v4l2;
 extern const vo_functions_t video_out_jpeg;
 extern const vo_functions_t video_out_gif89a;
-extern vo_functions_t video_out_vesa;
 extern const vo_functions_t video_out_directfb;
 extern const vo_functions_t video_out_dfbmga;
-extern const vo_functions_t video_out_xvidix;
-extern const vo_functions_t video_out_winvidix;
-extern const vo_functions_t video_out_cvidix;
 extern const vo_functions_t video_out_tdfx_vid;
 extern const vo_functions_t video_out_xvr100;
 extern const vo_functions_t video_out_tga;
@@ -143,6 +136,16 @@
 extern const vo_functions_t video_out_pnm;
 extern const vo_functions_t video_out_md5sum;
 
+/* The following declarations are _not_ const because functions pointers
+ * get overloaded during (re)initialization. */
+extern vo_functions_t video_out_cvidix;
+extern vo_functions_t video_out_fbdev;
+extern vo_functions_t video_out_svga;
+extern vo_functions_t video_out_vesa;
+extern vo_functions_t video_out_winvidix;
+extern vo_functions_t video_out_xover;
+extern vo_functions_t video_out_xvidix;
+
 const vo_functions_t* const video_out_drivers[] =
 {
 #ifdef CONFIG_XVR100