SDL_image: fixed patch submitted in [24741], so it does merge correctly

[vlc] / mozilla / vlcplugin.h

diff --git a/mozilla/vlcplugin.h b/mozilla/vlcplugin.h
index c2523bebd95112395f6ff769d510efb0228222e1..6d48bf3bb8f13f385427d8070312ad25e6b36c3a 100644 (file)
--- a/mozilla/vlcplugin.h
+++ b/mozilla/vlcplugin.h
@@ -52,6 +52,7 @@
 #   include <X11/Xlib.h>
 #   include <X11/Intrinsic.h>
 #   include <X11/StringDefs.h>
+#   include <X11/X.h>
 #endif
 
 class VlcPlugin
@@ -87,6 +88,14 @@ public:
 
 #if XP_UNIX
     int                 setSize(unsigned width, unsigned height);
+    Window              getVideoWindow()
+                            { return npvideo; };
+    void                setVideoWindow(Window window)
+                            { npvideo = window; };
+    Window              getControlWindow()
+                            { return npcontrol; };
+    void                setControlWindow(Window window)
+                            { npcontrol = window; };
 #endif
 
     uint16    i_npmode; /* either NP_EMBED or NP_FULL */
@@ -113,6 +122,7 @@ private:
 #endif
 #if XP_UNIX
     unsigned int     i_width, i_height;
+    Window           npvideo, npcontrol;
 #endif
 };
 
@@ -151,6 +161,7 @@ private:
     "video/x-ms-asf:asf,asx:Windows Media Video;" \
     "application/x-mplayer2::Windows Media;" \
     "video/x-ms-wmv:wmv:Windows Media;" \
+    "video/x-ms-wvx:wvx:Windows Media Video;" \
     /* Google VLC */ \
     "application/x-google-vlc-plugin::Google VLC plugin;" \
     /* WAV audio */ \
@@ -162,5 +173,7 @@ private:
     /* 3GPP2 */ \
     "audio/3gpp2:3g2,3gpp2:3GPP2 audio;" \
     "video/3gpp2:3g2,3gpp2:3GPP2 video;" \
+    /* DIVX */ \
+    "video/divx:divx:DivX video;"
 
 #endif