grain: fix clobber list

[vlc] / lib / media_player.c

diff --git a/lib/media_player.c b/lib/media_player.c
index 02c157096b501957c1a582a92d52736e51b5d103..14d5bcea4c932697860e7a5a18de5ea13bad9898 100644 (file)
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -413,7 +413,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
     var_Create (mp, "vmem-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
     var_Create (mp, "vmem-pitch", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
     var_Create (mp, "drawable-xid", VLC_VAR_INTEGER);
-#ifdef WIN32
+#if defined (WIN32) || defined (__OS2__)
     var_Create (mp, "drawable-hwnd", VLC_VAR_INTEGER);
 #endif
 #ifdef __APPLE__
@@ -935,7 +935,7 @@ void libvlc_media_player_set_hwnd( libvlc_media_player_t *p_mi,
                                    void *drawable )
 {
     assert (p_mi != NULL);
-#ifdef WIN32
+#if defined (WIN32) || defined (__OS2__)
     var_SetString (p_mi, "window",
                    (drawable != NULL) ? "embed-hwnd,any" : "");
     var_SetInteger (p_mi, "drawable-hwnd", (uintptr_t)drawable);
@@ -950,7 +950,7 @@ void libvlc_media_player_set_hwnd( libvlc_media_player_t *p_mi,
 void *libvlc_media_player_get_hwnd( libvlc_media_player_t *p_mi )
 {
     assert (p_mi != NULL);
-#ifdef WIN32
+#if defined (WIN32) || defined (__OS2__)
     return (void *)(uintptr_t)var_GetInteger (p_mi, "drawable-hwnd");
 #else
     return NULL;
@@ -1344,7 +1344,7 @@ libvlc_track_description_t *
                 malloc( sizeof( libvlc_track_description_t ) );
             if ( !p_actual )
             {
-                libvlc_track_description_release( p_track_description );
+                libvlc_track_description_list_release( p_track_description );
                 libvlc_printerr( "Not enough memory" );
                 goto end;
             }
@@ -1365,7 +1365,13 @@ end:
     return p_track_description;
 }
 
+// Deprecated alias for libvlc_track_description_list_release
 void libvlc_track_description_release( libvlc_track_description_t *p_td )
+{
+    libvlc_track_description_list_release( p_td );
+}
+
+void libvlc_track_description_list_release( libvlc_track_description_t *p_td )
 {
     libvlc_track_description_t *p_actual, *p_before;
     p_actual = p_td;