* skins2/src/skin_main.cpp: Do not forget to return a value

[vlc] / modules / video_output / opengl.c

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 98042e0558c72a062b94cfe8f145d76c42d7f163..09d16216f5f53648b438c1e4cd60424b47291789 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -116,12 +116,12 @@ static int SendEvents( vlc_object_t *, char const *,
  * Module descriptor
  *****************************************************************************/
 #define SPEED_TEXT N_( "OpenGL cube rotation speed" )
-#define SPEED_LONGTEXT N_( "If the OpenGL cube effect is enabled, this " \
-                           "controls its rotation speed." )
+#define SPEED_LONGTEXT N_( "Rotation speed of the OpenGL cube effect, if " \
+        "enabled." )
 
-#define EFFECT_TEXT N_("Select effect")
+#define EFFECT_TEXT N_("Effect")
 #define EFFECT_LONGTEXT N_( \
-    "Allows you to select different visual effects.")
+    "Several visual OpenGL effects are available." )
 
 static char *ppsz_effects[] = {
         "none", "cube", "transparent-cube" };
@@ -280,22 +280,40 @@ static int Init( vout_thread_t *p_vout )
 #elif VLCGL_FORMAT == GL_RGB
 #   if VLCGL_TYPE == GL_UNSIGNED_BYTE
     p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4');
+#       if defined( WORDS_BIGENDIAN )
+    p_vout->output.i_rmask = 0x00ff0000;
+    p_vout->output.i_gmask = 0x0000ff00;
+    p_vout->output.i_bmask = 0x000000ff;
+#       else
     p_vout->output.i_rmask = 0x000000ff;
     p_vout->output.i_gmask = 0x0000ff00;
     p_vout->output.i_bmask = 0x00ff0000;
+#       endif
     i_pixel_pitch = 3;
 #   else
     p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6');
+#       if defined( WORDS_BIGENDIAN )
+    p_vout->output.i_rmask = 0x001f;
+    p_vout->output.i_gmask = 0x07e0;
+    p_vout->output.i_bmask = 0xf800;
+#       else
     p_vout->output.i_rmask = 0xf800;
     p_vout->output.i_gmask = 0x07e0;
     p_vout->output.i_bmask = 0x001f;
+#       endif
     i_pixel_pitch = 2;
 #   endif
 #else
     p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2');
+#       if defined( WORDS_BIGENDIAN )
+    p_vout->output.i_rmask = 0xff000000;
+    p_vout->output.i_gmask = 0x00ff0000;
+    p_vout->output.i_bmask = 0x0000ff00;
+#       else
     p_vout->output.i_rmask = 0x000000ff;
     p_vout->output.i_gmask = 0x0000ff00;
     p_vout->output.i_bmask = 0x00ff0000;
+#       endif
     i_pixel_pitch = 4;
 #endif
 
@@ -314,14 +332,14 @@ static int Init( vout_thread_t *p_vout )
         malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch );
     if( !p_sys->pp_buffer[0] )
     {
-        msg_Err( p_vout, "Out of memory" );
+        msg_Err( p_vout, "out of memory" );
         return -1;
     }
     p_sys->pp_buffer[1] =
         malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch );
     if( !p_sys->pp_buffer[1] )
     {
-        msg_Err( p_vout, "Out of memory" );
+        msg_Err( p_vout, "out of memory" );
         return -1;
     }