* modules/codec/ffmpeg/video.c: fixed the last direct rendering bug.

[vlc] / include / modules_inner.h

diff --git a/include/modules_inner.h b/include/modules_inner.h
index 91e42f261e515fa0c21608f4f0a42b085c33445d..d7b5af1dccfd0d6827fe84513cd88974bc62e560 100644 (file)
--- a/include/modules_inner.h
+++ b/include/modules_inner.h
@@ -2,7 +2,7 @@
  * modules_inner.h : Macros used from within a module.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules_inner.h,v 1.33 2002/11/18 18:05:13 sam Exp $
+ * $Id: modules_inner.h,v 1.37 2003/01/19 03:16:24 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -113,15 +113,18 @@
             p_submodule->pp_shortcuts[ i_shortcut ] = NULL;                   \
         }                                                                     \
         {                                                                     \
-           module_config_t tmp = { CONFIG_HINT_END, NULL, NULL, '\0' };      \
+            static module_config_t tmp = { CONFIG_HINT_END, NULL, NULL, '\0', \
+                                           NULL, NULL, NULL, 0, 0.0, 0, 0,    \
+                                           0.0, 0.0, NULL,NULL, NULL,         \
+                                           VLC_FALSE };                       \
             p_config[ i_config ] = tmp;                                       \
         }                                                                     \
         config_Duplicate( p_module, p_config );                               \
         if( p_module->p_config == NULL )                                      \
         {                                                                     \
-            return -1;                                                        \
+            return VLC_EGENERIC;                                              \
         }                                                                     \
-        return 0 && i_shortcut;                                               \
+        return VLC_SUCCESS && i_shortcut;                                     \
     }                                                                         \
     struct _u_n_u_s_e_d_ /* the ; gets added */
 
@@ -146,7 +149,7 @@
     p_submodule->i_cpu = p_module->i_cpu;                                     \
     p_submodule->pf_activate = NULL;                                          \
     p_submodule->pf_deactivate = NULL
-    
+
 #define add_requirement( cap )                                                \
     p_module->i_cpu |= CPU_CAPABILITY_##cap