Fix merge conflicts for src/osd/osd.c

[vlc] / include / vlc_osd.h

diff --git a/include/vlc_osd.h b/include/vlc_osd.h
index 45344c4f7e65e112b106e79ca0f5e069cd520f89..707b6c4dc1107339d83cedf3d2513ce1e5918676 100644 (file)
--- a/include/vlc_osd.h
+++ b/include/vlc_osd.h
@@ -395,6 +395,11 @@ struct osd_menu_t
 
     /* quick link in the linked list. */
     osd_button_t  *p_last_button; /*< pointer to last button in the list */
+
+    /* misc parser */
+    module_t        *p_module;  /*< pointer to parser module */
+    char            *psz_file;  /*< Config file name */
+    image_handler_t *p_image;   /*< handler to image loading and conversion libraries */
 };
 
 /**