summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for vide...Lajos Molnar2014-06-051-9/+0
|\
| * DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-9/+0
* | am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\ \
| * \ Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| |\ \
| | * | Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
* | | | am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
|\ \ \ \ | |/ / /
| * | | am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
| |\ \ \
| | * | | libcpustats: Turn on -WerrorMark Salyzyn2014-05-302-3/+4
| | |/ /
* | | | am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
|\ \ \ \ | |/ / /
| * | | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
| |\ \ \ | | |/ /
| | * | Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-221-3/+2
* | | | am c10b874c: am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dp...Calin Juravle2014-05-221-1/+1
|\ \ \ \ | |/ / /
| * | | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-1/+1
| |\ \ \ | | |/ /
| | * | Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-1/+1
* | | | am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
|\ \ \ \ | |/ / /
| * | | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
| |\ \ \ | | |/ /
| | * | Move frameworks/av off private API.Elliott Hughes2014-05-211-31/+31
* | | | am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
|\ \ \ \ | |/ / /
| * | | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
| |\ \ \ | | |/ /
| | * | Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-211-10/+10
* | | | am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized...Andreas Huber2014-05-161-1/+1
|\ \ \ \ | |/ / /
| * | | am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale war...Andreas Huber2014-05-161-1/+1
| |\ \ \ | | |/ /
| | * | libstagefright foundation: fix uninitialized varibale warningAmit Pundir2014-05-151-1/+1
* | | | am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
|\ \ \ \ | |/ / /
| * | | am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| |\ \ \ | | |/ /
| | * | Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| | |\ \
| | | * | AwesomePlayer: use PTS for queueBufferLajos Molnar2014-05-011-7/+10
* | | | | am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
|\ \ \ \ \ | |/ / / /
| * | | | am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| |\ \ \ \ | | |/ / /
| | * | | Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| | |\ \ \ | | | |/ /
| | | * | Smooth out AwesomePlayerLajos Molnar2014-05-012-4/+25
* | | | | am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video e...Lajos Molnar2014-05-021-3/+7
|\ \ \ \ \ | |/ / / /
| * | | | am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
| | |\ \ \ | | | |/ /
| | | * | AwesomePlayer: improve scheduling of video event to hit PTSLajos Molnar2014-05-011-3/+7
* | | | | am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and Wind...Lajos Molnar2014-05-022-0/+178
|\ \ \ \ \ | |/ / / /
| * | | | am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFit...Lajos Molnar2014-05-022-0/+178
| |\ \ \ \ | | |/ / /
| | * | | Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"Lajos Molnar2014-05-022-0/+178
| | |\ \ \ | | | |/ /
| | | * | stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-012-0/+178
* | | | | am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bit...Glenn Kasten2014-05-027-35/+35
|\ \ \ \ \ | |/ / / /
| * | | | am 86438382: Merge "When passing a size_t via binder, use 64-bits uncondition...Glenn Kasten2014-05-027-35/+35
| |\ \ \ \ | | |/ / /
| | * | | Merge "When passing a size_t via binder, use 64-bits unconditionally"Glenn Kasten2014-05-027-35/+35
| | |\ \ \ | | | |/ / | | |/| |
| | | * | When passing a size_t via binder, use 64-bits unconditionallyGlenn Kasten2014-02-137-35/+35
* | | | | am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | |\ \ \
| | | * | | Add missing includeIgor Chernyshev2014-04-021-0/+1
* | | | | | am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0c388650: Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
| | |\ \ \ \