[vlc-commits] [Git][videolan/vlc][master] video_output: fix regression on lock

Sat Jul 24 15:45:16 UTC 2021


FranÃ§ois Cartegnie pushed to branch master at VideoLAN / VLC


Commits:
ccf7b5d9 by Alexandre Janniaux at 2021-07-24T14:58:18+00:00
video_output: fix regression on lock

The function is not locking the display_lock, so it should not unlock
it. It's a leftover of the previous code moves, where the error path has
not been checked correctly.

Regression from 2ba734287bedee47bebc14cb37258e473f9b464c

Co-authored-by: FranÃ§ois Cartegnie <fcvlcdev at free.fr>

- - - - -


1 changed file:

- src/video_output/video_output.c


Changes:

=====================================
src/video_output/video_output.c
=====================================
@@ -1273,8 +1273,6 @@ static int PrerenderPicture(vout_thread_sys_t *sys, picture_t *filtered,
 
     todisplay = vout_ConvertForDisplay(vd, todisplay);
     if (todisplay == NULL) {
-        vlc_mutex_unlock(&sys->display_lock);
-
         if (subpic != NULL)
             subpicture_Delete(subpic);
         return VLC_EGENERIC;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ccf7b5d9d48616544595070e0583bfef70d342e7

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ccf7b5d9d48616544595070e0583bfef70d342e7
You're receiving this email because of your account on code.videolan.org.


