eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-13 03:09:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of code.dyne.org:veejay

Browse Source 
Conflicts:
	veejay-current/veejay-client/configure.ac
	veejay-current/veejay-server/configure.ac
	veejay-current/veejay-server/libel/vj-avcodec.c
	veejay-current/veejay-server/libel/vj-el.c
	veejay-current/veejay-server/libstream/v4l2utils.c
	veejay-current/veejay-server/libvje/effects/chameleon.c
This commit is contained in:
niels
2014-11-22 20:59:53 +01:00
parent 3057db6d5d 136a4bf5dc
commit 8d2ce16227
63 changed files with 1381 additions and 2613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
veejay-current/veejay-server/libsample/sampleadm.c
View File

@@ -129,8 +129,13 @@ static hash_val_t int_hash(const void *key)
****************************************************************************************************/
static int int_compare(const void *key1, const void *key2)
{
return ((int) key1 < (int) key2 ? -1 :
((int) key1 > (int) key2 ? +1 : 0));
#ifdef ARCH_X86_64
return ((int64_t) key1 < (int64_t) key2 ? -1 :
((int64_t) key1 < (int64_t) key2 ? + 1 : 0 ));
#else
return ((int32_t) key1 < (int32_t) key2 ? -1 :
((int32_t) key1 > (int32_t) key2 ? +1 : 0));
#endif
}
int sample_update(sample_info *sample, int s1) {
@@ -1012,7 +1017,6 @@ int sample_set_resume(int s1,long position)
if(!sample)
return -1;
sample->resume_pos = position;
sample_update(s1,sample);
return 1;
}
long sample_get_resume(int s1)