Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
0e3c3788
Commit
0e3c3788
authored
Dec 03, 2001
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a crash when pausing.
parent
f9a96b8e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
include/threads.h
include/threads.h
+3
-3
plugins/x11/vout_xvideo.c
plugins/x11/vout_xvideo.c
+2
-2
No files found.
include/threads.h
View file @
0e3c3788
...
...
@@ -3,7 +3,7 @@
* This header provides a portable threads implementation.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: threads.h,v 1.3
0 2001/11/29 10:20:56
massiot Exp $
* $Id: threads.h,v 1.3
1 2001/12/03 13:58:59
massiot Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
...
...
@@ -681,7 +681,7 @@ static __inline__ int _vlc_cond_wait( char * psz_file, int i_line,
if
(
(
i_result
=
pthread_cond_timedwait
(
p_condvar
,
p_mutex
,
&
timeout
))
)
{
intf_
ErrMsg
(
"thread %d warning: Possible deadlock detected in cond_wait at %s:%d (%s)"
,
intf_
WarnMsg
(
1
,
"thread %d warning: Possible deadlock detected in cond_wait at %s:%d (%s)"
,
pthread_self
(),
psz_file
,
i_line
,
strerror
(
i_result
)
);
}
else
...
...
plugins/x11/vout_xvideo.c
View file @
0e3c3788
...
...
@@ -2,7 +2,7 @@
* vout_xvideo.c: Xvideo video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: vout_xvideo.c,v 1.3
2 2001/11/28 15:08:06
massiot Exp $
* $Id: vout_xvideo.c,v 1.3
3 2001/12/03 13:58:59
massiot Exp $
*
* Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr>
...
...
@@ -1295,7 +1295,7 @@ static void XVideoDisplay( vout_thread_t *p_vout )
int
i_dest_width
,
i_dest_height
;
int
i_dest_x
,
i_dest_y
;
if
(
!
p_vout
->
p_sys
->
p_xvimage
)
if
(
!
p_vout
->
p_sys
->
p_xvimage
||
!
p_vout
->
p_rendered_pic
)
{
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment