Commit 47ea5741 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Sanitize LIBVLC_DEPRECATED

Pointed-Out-By: default avatarOlivier Aubert <olivier.aubert@liris.cnrs.fr>
(cherry picked from commit 05a4a271)
parent 761772b9
...@@ -56,9 +56,9 @@ extern "C" { ...@@ -56,9 +56,9 @@ extern "C" {
* \param i_options the number of options to add to the item * \param i_options the number of options to add to the item
* \param ppsz_options the options to add to the item * \param ppsz_options the options to add to the item
*/ */
LIBVLC_DEPRECATED void libvlc_playlist_play( libvlc_instance_t *p_instance, LIBVLC_DEPRECATED LIBVLC_API
int i_id, int i_options, void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
char **ppsz_options ); int i_options, char **ppsz_options );
/** @}*/ /** @}*/
......
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
#endif #endif
#ifdef __LIBVLC__ #ifdef __LIBVLC__
/* Avoid unuseful warnings from libvlc with our deprecated APIs */ /* Avoid unhelpful warnings from libvlc with our deprecated APIs */
# define LIBVLC_DEPRECATED LIBVLC_API # define LIBVLC_DEPRECATED
#elif defined(__GNUC__) && \ #elif defined(__GNUC__) && \
(__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
# define LIBVLC_DEPRECATED LIBVLC_API __attribute__((deprecated)) # define LIBVLC_DEPRECATED __attribute__((deprecated))
#else #else
# define LIBVLC_DEPRECATED LIBVLC_API # define LIBVLC_DEPRECATED
#endif #endif
# ifdef __cplusplus # ifdef __cplusplus
......
...@@ -821,7 +821,8 @@ LIBVLC_API void libvlc_track_description_list_release( libvlc_track_description_ ...@@ -821,7 +821,8 @@ LIBVLC_API void libvlc_track_description_list_release( libvlc_track_description_
/** /**
* \deprecated Use libvlc_track_description_list_release instead * \deprecated Use libvlc_track_description_list_release instead
*/ */
LIBVLC_DEPRECATED void libvlc_track_description_release( libvlc_track_description_t *p_track_description ); LIBVLC_DEPRECATED
LIBVLC_API void libvlc_track_description_release( libvlc_track_description_t *p_track_description );
/** \defgroup libvlc_video LibVLC video controls /** \defgroup libvlc_video LibVLC video controls
* @{ * @{
...@@ -915,7 +916,7 @@ int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num, ...@@ -915,7 +916,7 @@ int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num,
* \param p_mi the media player * \param p_mi the media player
* \return the video pixel height or 0 if not applicable * \return the video pixel height or 0 if not applicable
*/ */
LIBVLC_DEPRECATED LIBVLC_DEPRECATED LIBVLC_API
int libvlc_video_get_height( libvlc_media_player_t *p_mi ); int libvlc_video_get_height( libvlc_media_player_t *p_mi );
/** /**
...@@ -925,7 +926,7 @@ int libvlc_video_get_height( libvlc_media_player_t *p_mi ); ...@@ -925,7 +926,7 @@ int libvlc_video_get_height( libvlc_media_player_t *p_mi );
* \param p_mi the media player * \param p_mi the media player
* \return the video pixel width or 0 if not applicable * \return the video pixel width or 0 if not applicable
*/ */
LIBVLC_DEPRECATED LIBVLC_DEPRECATED LIBVLC_API
int libvlc_video_get_width( libvlc_media_player_t *p_mi ); int libvlc_video_get_width( libvlc_media_player_t *p_mi );
/** /**
......
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