Modified demux_vaControlHelper to take bitrate in an int64_t

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 487efea45afdc29542ac19c84e55d3bb1de48b23..cd70b4bf85eb3c762892f9d56cd25c53bd55af49 100644 (file)
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -151,7 +151,7 @@ enum demux_query_e
     DEMUX_CAN_SEEK,            /* arg1= bool*    can fail (assume false)*/
 };
 
-VLC_EXPORT( int,       demux_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) );
+VLC_EXPORT( int,       demux_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int64_t i_bitrate, int i_align, int i_query, va_list args ) );
 
 /*************************************************************************
  * Miscellaneous helpers for demuxers

diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c
index 706b97bee162ee486ab7f72fff017e7ca0445a42..a6119645c7245fd7fab165b6872ef15ef68360e5 100644 (file)
--- a/modules/demux/rawvid.c
+++ b/modules/demux/rawvid.c
@@ -446,12 +446,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     demux_sys_t *p_sys  = p_demux->p_sys;
 
-    /* NB, demux_vaControlHelper only takes int for i_bps currently;
-     * (2**31)-1 is insufficient to store 1080p50 4:4:4. */
-    int64_t i_bps = 8LL * p_sys->frame_size * p_sys->pcr.i_divider_num
-                  / p_sys->pcr.i_divider_den;
+     /* (2**31)-1 is insufficient to store 1080p50 4:4:4. */
+    const int64_t i_bps = 8LL * p_sys->frame_size * p_sys->pcr.i_divider_num /
+                                                    p_sys->pcr.i_divider_den;
 
     /* XXX: DEMUX_SET_TIME is precise here */
     return demux_vaControlHelper( p_demux->s, 0, -1, i_bps,
                                    p_sys->frame_size, i_query, args );
 }
+

diff --git a/src/input/demux.c b/src/input/demux.c
index d8a549ff57ac116a175b7a6401d5a861c8770165..feaa251a2304178fee28db13bff38d8d586893a6 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -206,7 +206,7 @@ void demux_Delete( demux_t *p_demux )
  *****************************************************************************/
 int demux_vaControlHelper( stream_t *s,
                             int64_t i_start, int64_t i_end,
-                            int i_bitrate, int i_align,
+                            int64_t i_bitrate, int i_align,
                             int i_query, va_list args )
 {
     int64_t i_tell;