summaryrefslogtreecommitdiffstats
path: root/libhb/common.c
diff options
context:
space:
mode:
authordynaflash <[email protected]>2007-03-18 15:14:01 +0000
committerdynaflash <[email protected]>2007-03-18 15:14:01 +0000
commit91b712aaaebff79b14d8c341b96a807440001db3 (patch)
treeed6c09e72f7496b369cc1e5a0573f67d0bf078b1 /libhb/common.c
parentc252ad07466ffa60e8a930200ad5132043d91943 (diff)
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
Diffstat (limited to 'libhb/common.c')
-rw-r--r--libhb/common.c6
1 files changed, 3 insertions, 3 deletions
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;