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

[Rémi Denis-Courmont]

On Thu,  4 Jun 2009 23:12:33 +0200 (CEST), git at videolan.org (git version
control) wrote:
> vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Thu Jun 
4
> 23:10:08 2009 +0200| [120e9bb49d4648a29ea499a9a19973eeb571edbe] |
> 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
> 
>>
>
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=120e9bb49d4648a29ea499a9a19973eeb571edbe
> ---
> 
>  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 07656b1..984547a 100644
> --- a/src/video_output/vout_intf.c
> +++ b/src/video_output/vout_intf.c
> @@ -700,7 +700,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 );

By the way, timedwait returns immediately if i_deadline is elapsed.
Checking mdate() above seems pointless.

-- 
Rémi Denis-Courmont