Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6302 → Rev 6303

/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/library.mak.bak
File deleted
/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.mak.bak
File deleted
/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/Makefile
103,8 → 103,6
 
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
 
include $(SRC_PATH)/doc/Makefile
 
define DOPROG
OBJS-$(1) += $(1).o $(EXEOBJS) $(OBJS-$(1)-yes)
$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/config.mak
465,7 → 465,7
HAVE_EBP_AVAILABLE=yes
HAVE_EBX_AVAILABLE=yes
!HAVE_GNU_AS=yes
HAVE_GNU_WINDRES=yes
!HAVE_GNU_WINDRES=yes
!HAVE_IBM_ASM=yes
HAVE_INLINE_ASM_LABELS=yes
HAVE_INLINE_ASM_NONLOCAL_LABELS=yes
/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavcodec/hapdec.c
37,7 → 37,7
#include "bytestream.h"
#include "hap.h"
#include "internal.h"
#include "memory.h"
//#include "memory.h"
#include "snappy.h"
#include "texturedsp.h"
#include "thread.h"
/contrib/sdk/sources/libsync/Makefile
1,6 → 1,6
LIBRARY= libsync
 
FASM = fasm.exe
FASM = fasm
AR = kos32-ar
ARFLAGS = crs
 
/contrib/sdk/sources/libsync/m_lock_timeout.asm
0,0 → 1,68
format MS COFF
use32
 
MUTEX.lock equ 0
MUTEX.handle equ 4
 
section '.text' align 16 code readable executable
 
@mutex_lock_timeout@8
push esi
mov esi, edx
push ebx
mov edx, 1
lock xadd [ecx+MUTEX.lock], edx
mov eax, 1
test edx, edx
jnz .slow
.ok:
pop ebx
pop esi
retn
align 4
.slow:
mov edx, 2
xchg edx, [ecx+MUTEX.lock]
xor eax, eax
test edx, edx
jz .ok
 
mov edx, 2
mov ecx, [ecx+MUTEX.handle]
mov al, 77
mov ebx, edx
int 0x40
add eax, 1
pop ebx
pop esi
ret
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
/contrib/sdk/sources/sound/Makefile
1,6 → 1,6
 
AR = kos32-ar
FASM:= fasm.exe
FASM:= fasm
 
TARGET:= libsound