[vlc-commits] commit: Made video_format_t vout_Create/Request parameter const. ( Laurent Aimar )

git at videolan.org git at videolan.org
Tue May 18 23:10:45 CEST 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue May 18 21:26:29 2010 +0200| [a4b5488b09fd42b31aa03ab83a59c4ea32e471de] | committer: Laurent Aimar 

Made video_format_t vout_Create/Request parameter const.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a4b5488b09fd42b31aa03ab83a59c4ea32e471de
---

 include/vlc_vout.h              |    4 ++--
 src/video_output/video_output.c |    7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 2d3f0b2..84c04fa 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -102,7 +102,7 @@ struct vout_thread_t
  * \return a vout if p_fmt is non NULL and the request is successfull, NULL
  * otherwise
  */
-VLC_EXPORT( vout_thread_t *, vout_Request, ( vlc_object_t *p_this, vout_thread_t *p_vout, video_format_t *p_fmt ) );
+VLC_EXPORT( vout_thread_t *, vout_Request, ( vlc_object_t *p_this, vout_thread_t *p_vout, const video_format_t *p_fmt ) );
 #define vout_Request(a,b,c) vout_Request(VLC_OBJECT(a),b,c)
 
 /**
@@ -114,7 +114,7 @@ VLC_EXPORT( vout_thread_t *, vout_Request, ( vlc_object_t *p_this, vout_thread_t
  * \param p_fmt the video format requested
  * \return a vout if the request is successfull, NULL otherwise
  */
-VLC_EXPORT( vout_thread_t *, vout_Create, ( vlc_object_t *p_this, video_format_t *p_fmt ) );
+VLC_EXPORT( vout_thread_t *, vout_Create, ( vlc_object_t *p_this, const video_format_t *p_fmt ) );
 #define vout_Create(a,b) vout_Create(VLC_OBJECT(a),b)
 
 /**
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 5a158be..b32872c 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -92,15 +92,14 @@ static int VoutValidateFormat(video_format_t *dst,
     return VLC_SUCCESS;
 }
 
-#undef vout_Request
 /*****************************************************************************
  * vout_Request: find a video output thread, create one, or destroy one.
  *****************************************************************************
  * This function looks for a video output thread matching the current
  * properties. If not found, it spawns a new one.
  *****************************************************************************/
-vout_thread_t *vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
-                             video_format_t *p_fmt )
+vout_thread_t *(vout_Request)( vlc_object_t *p_this, vout_thread_t *p_vout,
+                               const video_format_t *p_fmt )
 {
     if( !p_fmt )
     {
@@ -164,7 +163,7 @@ vout_thread_t *vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
  * This function creates a new video output thread, and returns a pointer
  * to its description. On error, it returns NULL.
  *****************************************************************************/
-vout_thread_t * (vout_Create)( vlc_object_t *p_parent, video_format_t *p_fmt )
+vout_thread_t * (vout_Create)( vlc_object_t *p_parent, const video_format_t *p_fmt )
 {
     video_format_t original;
     if (VoutValidateFormat(&original, p_fmt))



More information about the vlc-commits mailing list