[vlc-commits] transcode: video: remove write-only decoder_vctx_out variable

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jul 10 16:00:31 2020 +0200| [0d05d0d528ce785096d62abad59324bc69534c28] | committer: Steve Lhomme

transcode: video: remove write-only decoder_vctx_out variable

If we need it we get it from incoming pictures.

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

 modules/stream_out/transcode/transcode.h | 1 -
 modules/stream_out/transcode/video.c     | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/stream_out/transcode/transcode.h b/modules/stream_out/transcode/transcode.h
index 6e4c4f3291..0ca725d46b 100644
--- a/modules/stream_out/transcode/transcode.h
+++ b/modules/stream_out/transcode/transcode.h
@@ -140,7 +140,6 @@ struct sout_stream_id_sys_t
 
     /* only rw from pf_*_format_update() */
     es_format_t decoder_out;
-    vlc_video_context *decoder_vctx_out;
 
     const sout_filters_config_t *p_filterscfg;
 
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 094c1a357f..ed00436349 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -111,7 +111,6 @@ static int video_update_format_decoder( decoder_t *p_dec, vlc_video_context *vct
         return 0;
     }
 
-    id->decoder_vctx_out = vctx;
     es_format_Clean( &id->decoder_out );
     es_format_Copy( &id->decoder_out, &p_dec->fmt_out );
 
@@ -178,7 +177,6 @@ int transcode_video_init( sout_stream_t *p_stream, const es_format_t *p_fmt,
     id->fifo.pic.last = &id->fifo.pic.first;
     id->b_transcode = true;
     es_format_Init( &id->decoder_out, VIDEO_ES, 0 );
-    id->decoder_vctx_out = NULL;
 
     /* Open decoder
      */
@@ -210,7 +208,6 @@ int transcode_video_init( sout_stream_t *p_stream, const es_format_t *p_fmt,
     {
         es_format_Clean( &id->decoder_out );
         es_format_Copy( &id->decoder_out, &id->p_decoder->fmt_out );
-        id->decoder_vctx_out = NULL /* TODO id->p_decoder->vctx_out*/;
     }
 
     /*
@@ -573,7 +570,6 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
             video_format_Copy( &id->decoder_out.video, &p_pic->format );
             transcode_video_framerate_apply( &p_pic->format, &id->decoder_out.video );
             transcode_video_sar_apply( &p_pic->format, &id->decoder_out.video );
-            id->decoder_vctx_out = picture_GetVideoContext(p_pic);
 
             if( !transcode_video_filters_configured( id ) )
             {
@@ -581,7 +577,7 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
                                                   id->p_filterscfg,
                                                  (id->p_enccfg->video.fps.num > 0),
                                                  &id->decoder_out,
-                                                 id->decoder_vctx_out,
+                                                 picture_GetVideoContext(p_pic),
                                                  transcode_encoder_format_in( id->encoder ),
                                                  id ) != VLC_SUCCESS )
                     goto error;