summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
* 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 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
|\ \
| * | libcpustats: Turn on -WerrorMark Salyzyn2014-05-302-3/+4
| |/
* | 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 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 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 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 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 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 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 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 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 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 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 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
| |\ \ \
| | * | | ACodec: add frame render/drop systraceLajos Molnar2014-04-301-0/+7
* | | | | am 6eafba6b: Merge "Temporary workaround for log spam"Glenn Kasten2014-05-011-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | Temporary workaround for log spamGlenn Kasten2014-05-011-0/+5
| |/ / /
* | | | am 416685d0: Merge "Fix format warnings"Glenn Kasten2014-04-301-3/+3
|\ \ \ \ | |/ / /
| * | | Fix format warningsGlenn Kasten2014-04-281-3/+3
* | | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-2924-507/+1894
|\ \ \ \ | |/ / / |/| | |
| * | | am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when par...Lajos Molnar2014-03-211-0/+12
| |\ \ \
| | * \ \ Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." i...Lajos Molnar2014-03-211-0/+12
| | |\ \ \
| | | * | | DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-211-0/+12
| * | | | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32...Rachad2014-03-211-3/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Increased recorded MP4 max file size to 4GBRachad2014-03-211-3/+5
| | |/ / /
| * | | | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:...Marco Nelissen2014-03-201-0/+1
| |\ \ \ \ | | |/ / /
| | * | | am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628:...Marco Nelissen2014-03-201-0/+1
| | |\ \ \
| | | * \ \ am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830:...Marco Nelissen2014-03-201-0/+1
| | | |\ \ \
| | | | * \ \ am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | |\ \ \