Commit 57a4f916 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Revert "Remove libvlc_free"

This reverts commit 61f0547b.

Conflicts:

	include/vlc/libvlc.h
parent 39349f5c
......@@ -226,6 +226,14 @@ VLC_PUBLIC_API const char * libvlc_get_compiler(void);
*/
VLC_PUBLIC_API const char * libvlc_get_changeset(void);
/**
* Frees an heap allocation returned by a LibVLC function.
* If you know you're using the same underlying C run-time as the LibVLC
* implementation, then you can call ANSI C free() directly instead.
*
* \param ptr the pointer
*/
VLC_PUBLIC_API void libvlc_free( void *ptr );
/** \defgroup libvlc_event LibVLC asynchronous events
* LibVLC emits asynchronous events.
......
......@@ -735,7 +735,7 @@ VLC_PUBLIC_API void libvlc_video_set_scale( libvlc_media_player_t *p_mi, float f
*
* \param p_mi the media player
* \return the video aspect ratio or NULL if unspecified
* (the result must be released with free()).
* (the result must be released with free() or libvlc_free()).
*/
VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi );
......
......@@ -159,3 +159,8 @@ const char * libvlc_get_changeset(void)
extern const char psz_vlc_changeset[];
return psz_vlc_changeset;
}
void libvlc_free( void *ptr )
{
free( ptr );
}
......@@ -32,6 +32,7 @@ libvlc_event_manager_register_event_type
libvlc_event_manager_release
libvlc_event_send
libvlc_event_type_name
libvlc_free
libvlc_get_changeset
libvlc_get_compiler
libvlc_get_fullscreen
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment