block_BytestreamInit(): rationalize prototype

diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h
index 1528b94387a4053d059bab47d1620a597d6da817..6852509f1f4eca8bb56cc95925c53d54429f6c04 100644 (file)
--- a/include/vlc_block_helper.h
+++ b/include/vlc_block_helper.h
@@ -37,15 +37,10 @@ typedef struct block_bytestream_t
 /*****************************************************************************
  * block_bytestream_t management
  *****************************************************************************/
-VLC_USED
-static inline block_bytestream_t block_BytestreamInit( void )
+static inline void block_BytestreamInit( block_bytestream_t *p_bytestream )
 {
-    block_bytestream_t bytestream;
-
-    bytestream.i_offset = 0;
-    bytestream.p_chain = bytestream.p_block = NULL;
-
-    return bytestream;
+    p_bytestream->p_chain = p_bytestream->p_block = NULL;
+    p_bytestream->i_offset = 0;
 }
 
 static inline void block_BytestreamRelease( block_bytestream_t *p_bytestream )
@@ -65,8 +60,7 @@ static inline void block_BytestreamRelease( block_bytestream_t *p_bytestream )
 static inline void block_BytestreamEmpty( block_bytestream_t *p_bytestream )
 {
     block_BytestreamRelease( p_bytestream );
-
-    *p_bytestream = block_BytestreamInit();
+    block_BytestreamInit( p_bytestream );
 }
 
 /**

diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index da59b1664b5fd2fa22a956f82534e7e6d8c8b598..d2768a46fb4d92bc6ec671fa5a09763ae00061b3 100644 (file)
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -140,7 +140,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
     date_Set( &p_sys->end_date, 0 );
     p_sys->i_pts = VLC_TS_INVALID;
 
-    p_sys->bytestream = block_BytestreamInit();
+    block_BytestreamInit( &p_sys->bytestream );
 
     /* Set output properties */
     p_dec->fmt_out.i_cat = AUDIO_ES;

diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index 57899c3df3c1cabfe6b0926d22173a52b20a508b..812c49f3118f0f9899dcae210fca0328f4704571 100644 (file)
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -157,7 +157,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
     p_sys->b_dts_hd = false;
     p_sys->i_pts = VLC_TS_INVALID;
 
-    p_sys->bytestream = block_BytestreamInit();
+    block_BytestreamInit( &p_sys->bytestream );
 
     /* Set output properties */
     p_dec->fmt_out.i_cat = AUDIO_ES;

diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index 2335c4e457e05e2ce8d75a1fedd1e5b0fff34356..4fef2ed2cc54ddfbfd84426a37665e51714ca06c 100644 (file)
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -150,7 +150,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->b_packetizer = false;
     p_sys->i_state = STATE_NOSYNC;
     date_Set( &p_sys->end_date, 0 );
-    p_sys->bytestream = block_BytestreamInit();
+    block_BytestreamInit( &p_sys->bytestream );
     p_sys->i_pts = VLC_TS_INVALID;
     p_sys->b_discontinuity = false;
 

diff --git a/modules/packetizer/dirac.c b/modules/packetizer/dirac.c
index fb7fb1519f29392afaa67f40ed6bbec451b3a224..c56aae7b1112fc40a57f70e4ce7b70265073e5f7 100644 (file)
--- a/modules/packetizer/dirac.c
+++ b/modules/packetizer/dirac.c
@@ -1365,7 +1365,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_dts_last_out = p_sys->i_pts_last_out = VLC_TS_INVALID;
 
     p_sys->i_state = NOT_SYNCED;
-    p_sys->bytestream = block_BytestreamInit();
+    block_BytestreamInit( &p_sys->bytestream );
 
     p_sys->pp_outqueue_last = &p_sys->p_outqueue;
     p_sys->pp_eu_last = &p_sys->p_eu;

diff --git a/modules/packetizer/flac.c b/modules/packetizer/flac.c
index d45fb5a94433f7141d5173319983d6837ad0abc9..5d6ad75f6f13107f4c78020a1a2850860f397c29 100644 (file)
--- a/modules/packetizer/flac.c
+++ b/modules/packetizer/flac.c
@@ -127,7 +127,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_state       = STATE_NOSYNC;
     p_sys->b_stream_info = false;
     p_sys->i_pts         = VLC_TS_INVALID;
-    p_sys->bytestream    = block_BytestreamInit();
+    block_BytestreamInit( &p_sys->bytestream );
 
     /* */
     es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );

diff --git a/modules/packetizer/mlp.c b/modules/packetizer/mlp.c
index d466e77102904dc67cd37495eb6655c5a9e78a45..1b9dc8bceaa3adb0eede73d394b3a9ec5935fece 100644 (file)
--- a/modules/packetizer/mlp.c
+++ b/modules/packetizer/mlp.c
@@ -133,7 +133,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_state = STATE_NOSYNC;
     date_Set( &p_sys->end_date, 0 );
 
-    p_sys->bytestream = block_BytestreamInit();
+    block_BytestreamInit( &p_sys->bytestream );
     p_sys->b_mlp = false;
 
     /* Set output properties */

diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index 3e4561c09d213a64031992f729c671bed66e824c..b0de740eb3f388ea20e2bc0eed64ccf74c7fd641 100644 (file)
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -206,7 +206,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
     /* Misc init */
     p_sys->i_state = STATE_NOSYNC;
     date_Set( &p_sys->end_date, 0 );
-    p_sys->bytestream = block_BytestreamInit();
+    block_BytestreamInit( &p_sys->bytestream );
     p_sys->b_latm_cfg = false;
 
     /* Set output properties */

diff --git a/modules/packetizer/packetizer_helper.h b/modules/packetizer/packetizer_helper.h
index b46b4657fcfb1fe16f15aaf4f861bffaa375b5cb..bb6f3edfbbfcd510fc1c043065277fd6ccd76feb 100644 (file)
--- a/modules/packetizer/packetizer_helper.h
+++ b/modules/packetizer/packetizer_helper.h
@@ -68,7 +68,7 @@ static inline void packetizer_Init( packetizer_t *p_pack,
                                     void *p_private )
 {
     p_pack->i_state = STATE_NOSYNC;
-    p_pack->bytestream = block_BytestreamInit();
+    block_BytestreamInit( &p_pack->bytestream );
     p_pack->i_offset = 0;
     p_pack->b_flushing = false;