Martin Storsjö e9c3403674 Merge some WIN32 ifdefs that were directly next to each other

2014-03-04 12:17:32 +02:00

..

api/svc

add timestamp in encoder interface

2014-03-03 17:05:06 +08:00

build

Merge pull request #387 from zhilwang/arm-asm

2014-03-04 11:08:17 +08:00

common

get cpu cores for android

2014-03-04 15:50:41 +08:00

console

Merge pull request #358 from volvet/add_ios_encDemo

2014-02-27 10:52:14 -08:00

decoder

get cpu cores for android

2014-03-04 15:50:41 +08:00

encoder

Merge some WIN32 ifdefs that were directly next to each other

2014-03-04 12:17:32 +02:00

processing

Remove a redundant makefile ifdef

2014-03-01 23:56:14 +02:00