vlc | branch: master | Thomas Guillem <[email protected]> | Wed Jul 25 17:28:35 
2018 +0200| [43c7c251be6376b16ddf4bfb337e09b4e30eac34] | committer: Thomas 
Guillem

es_out: fix double lock

Regression from 8b9df99194e9609bbfa5e545034227917c221e85

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

 src/input/es_out.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 9728fe5279..37d4c10ab6 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2602,7 +2602,9 @@ static int EsOutVaControlLocked( es_out_t *out, int 
i_query, va_list args )
                     EsOutControlLocked( out, ES_OUT_RESET_PCR );
                 }
 
-                es_out_SetJitter( out, i_pts_delay_base, i_pts_delay - 
i_pts_delay_base, p_sys->i_cr_average );
+                EsOutControlLocked( out, ES_OUT_SET_JITTER, i_pts_delay_base,
+                                    i_pts_delay - i_pts_delay_base,
+                                    p_sys->i_cr_average );
             }
         }
         return VLC_SUCCESS;

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to