[vlc-commits] aout: constify the video_format_t when requesting a vout

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Tue Jul 11 13:25:22 2017 +0200| [9d4b0408824ac14d404bb0b23264baae17627970] | committer: Jean-Baptiste Kempf

aout: constify the video_format_t when requesting a vout

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 include/vlc_aout.h               | 2 +-
 src/audio_output/aout_internal.h | 2 +-
 src/audio_output/filters.c       | 2 +-
 src/input/decoder.c              | 3 ++-
 src/input/resource.c             | 4 ++--
 src/input/resource.h             | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index e6b570361e..6045652b43 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -334,7 +334,7 @@ VLC_API block_t *aout_FiltersPlay(aout_filters_t *, block_t *, int rate);
 VLC_API block_t *aout_FiltersDrain(aout_filters_t *);
 VLC_API void     aout_FiltersFlush(aout_filters_t *);
 
-VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt );
+VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, const video_format_t *p_fmt );
 
 /** @} */
 
diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 4088d1a956..3cb8058f60 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -38,7 +38,7 @@ enum {
 struct aout_request_vout
 {
     struct vout_thread_t  *(*pf_request_vout)( void *, struct vout_thread_t *,
-                                               video_format_t *, bool );
+                                               const video_format_t *, bool );
     void *p_private;
 };
 
diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index 50ddb0cd32..5e2547dcbc 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -354,7 +354,7 @@ static int VisualizationCallback (vlc_object_t *obj, const char *var,
 }
 
 vout_thread_t *aout_filter_RequestVout (filter_t *filter, vout_thread_t *vout,
-                                        video_format_t *fmt)
+                                        const video_format_t *fmt)
 {
     /* NOTE: This only works from aout_filters_t.
      * If you want to use visualization filters from another place, you will
diff --git a/src/input/decoder.c b/src/input/decoder.c
index c28c953a59..b292658b38 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -278,7 +278,8 @@ static void DecoderUpdateFormatLocked( decoder_t *p_dec )
  * Buffers allocation callbacks for the decoders
  *****************************************************************************/
 static vout_thread_t *aout_request_vout( void *p_private,
-                                         vout_thread_t *p_vout, video_format_t *p_fmt, bool b_recyle )
+                                         vout_thread_t *p_vout,
+                                         const video_format_t *p_fmt, bool b_recyle )
 {
     decoder_t *p_dec = p_private;
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
diff --git a/src/input/resource.c b/src/input/resource.c
index 12dc847094..1dd1937b5b 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -195,7 +195,7 @@ static void DisplayVoutTitle( input_resource_t *p_resource,
 }
 static vout_thread_t *RequestVout( input_resource_t *p_resource,
                                    vout_thread_t *p_vout,
-                                   video_format_t *p_fmt, unsigned dpb_size,
+                                   const video_format_t *p_fmt, unsigned dpb_size,
                                    bool b_recycle )
 {
     vlc_assert_locked( &p_resource->lock );
@@ -460,7 +460,7 @@ void input_resource_SetInput( input_resource_t *p_resource, input_thread_t *p_in
 
 vout_thread_t *input_resource_RequestVout( input_resource_t *p_resource,
                                             vout_thread_t *p_vout,
-                                            video_format_t *p_fmt, unsigned dpb_size,
+                                            const video_format_t *p_fmt, unsigned dpb_size,
                                             bool b_recycle )
 {
     vlc_mutex_lock( &p_resource->lock );
diff --git a/src/input/resource.h b/src/input/resource.h
index 4c24c749c5..8f83eb3183 100644
--- a/src/input/resource.h
+++ b/src/input/resource.h
@@ -39,7 +39,8 @@ sout_instance_t *input_resource_RequestSout( input_resource_t *, sout_instance_t
 /**
  * This function handles vout request.
  */
-vout_thread_t *input_resource_RequestVout( input_resource_t *, vout_thread_t *, video_format_t *, unsigned dpb_size, bool b_recycle );
+vout_thread_t *input_resource_RequestVout( input_resource_t *, vout_thread_t *,
+                                           const video_format_t *, unsigned dpb_size, bool b_recycle );
 
 /**
  * This function returns one of the current vout if any.