[vlc-devel] commit: core vout: Fix snapshots (Derk-Jan Hartman )

git version control git at videolan.org
Thu Jun 4 23:12:49 CEST 2009


vlc | branch: 1.0-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Thu Jun  4 23:10:08 2009 +0200| [c561cd7af22cb3a88742877d12bd592e41059437] | committer: Derk-Jan Hartman 

core vout: Fix snapshots

vlc_cond_timedwait() for the snapshots was using the wrong timevalue.
Thx to fenrir for helping me chase this one. Fixes #2819
(cherry picked from commit 120e9bb49d4648a29ea499a9a19973eeb571edbe)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

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

 src/video_output/vout_intf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 80f23e9..04b30ae 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -734,7 +734,7 @@ int vout_GetSnapshot( vout_thread_t *p_vout,
            mdate() < i_deadline )
     {
         vlc_cond_timedwait( &p_sys->snapshot.wait, &p_sys->snapshot.lock,
-                            i_timeout );
+                            i_deadline );
     }
 
     picture_t *p_picture = p_sys->snapshot.p_picture;




More information about the vlc-devel mailing list