[vlc-commits] decoder: fix data race

Thomas Guillem git at videolan.org
Fri Jan 22 08:56:20 UTC 2021


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Jan 20 11:59:42 2021 +0100| [46f73728a597df445d25b4535cd7ddf55ed9fb2c] | committer: Thomas Guillem

decoder: fix data race

owner->fmt need to be read with owner->lock held or from the module
thread.

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

 src/input/decoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 3f03f36b09..48d4100356 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -2317,7 +2317,7 @@ void vlc_input_decoder_Flush( vlc_input_decoder_t *p_owner )
 
     vlc_fifo_Unlock( p_owner->p_fifo );
 
-    if ( p_owner->fmt.i_cat == VIDEO_ES )
+    if ( p_owner->dec.fmt_in.i_cat == VIDEO_ES )
     {
         /* Set the pool cancel state. This will unblock the module if it is
          * waiting for new pictures (likely). This state will be reset back



More information about the vlc-commits mailing list