[vlc-commits] transcode: rename ambigous var

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jun 21 21:49:52 2018 +0200| [e52a67d526582b9ca9c88cb1f8ad545a36964ccf] | committer: Francois Cartegnie

transcode: rename ambigous var

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

 modules/stream_out/transcode/audio.c     |  6 +++---
 modules/stream_out/transcode/spu.c       |  4 ++--
 modules/stream_out/transcode/transcode.c | 14 +++++++-------
 modules/stream_out/transcode/transcode.h |  2 +-
 modules/stream_out/transcode/video.c     |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index f982eeb78e..5c03274823 100644
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -321,10 +321,10 @@ int transcode_audio_process( sout_stream_t *p_stream,
             date_Init( &id->next_input_pts, id->audio_dec_out.i_rate, 1 );
             date_Set( &id->next_input_pts, p_audio_buf->i_pts );
 
-            if (!id->id)
+            if (!id->downstream_id)
             {
-                id->id = sout_StreamIdAdd( p_stream->p_next, &id->p_encoder->fmt_out );
-                if (!id->id)
+                id->downstream_id = sout_StreamIdAdd( p_stream->p_next, &id->p_encoder->fmt_out );
+                if (!id->downstream_id)
                 {
                     vlc_mutex_unlock(&id->fifo.lock);
                     goto error;
diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c
index 4e1337fa27..6443d706a8 100644
--- a/modules/stream_out/transcode/spu.c
+++ b/modules/stream_out/transcode/spu.c
@@ -239,10 +239,10 @@ bool transcode_spu_add( sout_stream_t *p_stream, const es_format_t *p_fmt,
         }
 
         /* open output stream */
-        id->id = sout_StreamIdAdd( p_stream->p_next, &id->p_encoder->fmt_out );
+        id->downstream_id = sout_StreamIdAdd( p_stream->p_next, &id->p_encoder->fmt_out );
         id->b_transcode = true;
 
-        if( !id->id )
+        if( !id->downstream_id )
         {
             transcode_spu_close( p_stream, id );
             return false;
diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 61b2f6e938..f80532b300 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -498,7 +498,7 @@ static void *Add( sout_stream_t *p_stream, const es_format_t *p_fmt )
         goto error;
 
     vlc_mutex_init(&id->fifo.lock);
-    id->id = NULL;
+    id->downstream_id = NULL;
     id->p_decoder = NULL;
     id->p_encoder = NULL;
 
@@ -544,10 +544,10 @@ static void *Add( sout_stream_t *p_stream, const es_format_t *p_fmt )
     {
         msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
                  (char*)&p_fmt->i_codec );
-        id->id = sout_StreamIdAdd( p_stream->p_next, p_fmt );
+        id->downstream_id = sout_StreamIdAdd( p_stream->p_next, p_fmt );
         id->b_transcode = false;
 
-        success = id->id;
+        success = id->downstream_id;
     }
 
     if(!success)
@@ -583,7 +583,7 @@ static void Del( sout_stream_t *p_stream, void *_id )
         }
     }
 
-    if( id->id ) sout_StreamIdDel( p_stream->p_next, id->id );
+    if( id->downstream_id ) sout_StreamIdDel( p_stream->p_next, id->downstream_id );
 
     DeleteSoutStreamID( id );
 }
@@ -598,8 +598,8 @@ static int Send( sout_stream_t *p_stream, void *_id, block_t *p_buffer )
 
     if( !id->b_transcode )
     {
-        if( id->id )
-            return sout_StreamIdSend( p_stream->p_next, id->id, p_buffer );
+        if( id->downstream_id )
+            return sout_StreamIdSend( p_stream->p_next, id->downstream_id, p_buffer );
         else
             goto error;
     }
@@ -635,7 +635,7 @@ static int Send( sout_stream_t *p_stream, void *_id, block_t *p_buffer )
     }
 
     if( p_out )
-        return sout_StreamIdSend( p_stream->p_next, id->id, p_out );
+        return sout_StreamIdSend( p_stream->p_next, id->downstream_id, p_out );
     return VLC_SUCCESS;
 error:
     if( p_buffer )
diff --git a/modules/stream_out/transcode/transcode.h b/modules/stream_out/transcode/transcode.h
index 06232e6612..dd789e3fc4 100644
--- a/modules/stream_out/transcode/transcode.h
+++ b/modules/stream_out/transcode/transcode.h
@@ -64,7 +64,7 @@ struct sout_stream_id_sys_t
     bool            b_error;
 
     /* id of the out stream */
-    void *id;
+    void *downstream_id;
 
     /* Decoder */
     decoder_t       *p_decoder;
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 3377c02ac0..1a32055492 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -607,8 +607,8 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream,
     id->p_encoder->fmt_out.i_codec =
         vlc_fourcc_GetCodec( VIDEO_ES, id->p_encoder->fmt_out.i_codec );
 
-    id->id = sout_StreamIdAdd( p_stream->p_next, &id->p_encoder->fmt_out );
-    if( !id->id )
+    id->downstream_id = sout_StreamIdAdd( p_stream->p_next, &id->p_encoder->fmt_out );
+    if( !id->downstream_id )
     {
         msg_Err( p_stream, "cannot add this stream" );
         return VLC_EGENERIC;