[vlc-devel] [PATCH] demux/ogg: fix stream re-use

Marvin Scholz epirat07 at gmail.com
Thu Oct 8 15:26:55 CEST 2020


Stream re-use could never happen, as p_stream->p_es is always NULL
here, as implied by the earlier check:

   if ( p_stream->p_es == NULL && !p_stream->b_finished )

To fix that, the check for a non-null p_stream->p_es is removed.

Partially fixes #25186
---
 modules/demux/ogg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 90edf1cb7e0..cedaccca068 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -2141,7 +2141,7 @@ static void Ogg_CreateES( demux_t *p_demux, bool stable_id )
             if( p_old_stream &&
                 p_old_stream->fmt.i_cat == p_stream->fmt.i_cat &&
                 p_old_stream->fmt.i_codec == p_stream->fmt.i_codec &&
-                p_old_stream->p_es != NULL && p_stream->p_es != NULL )
+                p_old_stream->p_es != NULL )
             {
                 msg_Dbg( p_demux, "will reuse old stream to avoid glitch" );
 
-- 
2.24.3 (Apple Git-128)



More information about the vlc-devel mailing list