From 91b712aaaebff79b14d8c341b96a807440001db3 Mon Sep 17 00:00:00 2001 From: dynaflash Date: Sun, 18 Mar 2007 15:14:01 +0000 Subject: saintdev's 64-bit deadlock fix -should fix some issues when HB is used on a 64 bit system. -thanks saintdev! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@436 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libhb/common.c') diff --git a/libhb/common.c b/libhb/common.c index 7b41a93fb..1d66e0bcf 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -377,7 +377,7 @@ void hb_list_seebytes( hb_list_t * l, uint8_t * dst, int size ) * in that buffer. *********************************************************************/ void hb_list_getbytes( hb_list_t * l, uint8_t * dst, int size, - uint64_t * pts, int * pos ) + uint64_t * pts, uint64_t * pos ) { hb_buffer_t * buf; int copied; @@ -385,8 +385,8 @@ void hb_list_getbytes( hb_list_t * l, uint8_t * dst, int size, uint8_t has_pts; /* So we won't have to deal with NULL pointers */ - uint64_t dummy1; - int dummy2; + uint64_t dummy1, dummy2; + if( !pts ) pts = &dummy1; if( !pos ) pos = &dummy2; -- cgit v1.2.3