summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* Merge "MatroskaExtractor: track specific seeking"Robert Shih2014-07-023-26/+96
|\
| * MatroskaExtractor: track specific seekingRobert Shih2014-06-193-26/+96
* | Merge "Add HEVC encoder support to ACodec"Rachad2014-06-271-0/+60
|\ \
| * | Add HEVC encoder support to ACodecRachad2014-06-261-0/+60
* | | Fix AAC timestampsMarco Nelissen2014-06-262-13/+29
* | | Merge "HLS: only queue discontinuity for first block"Chong Zhang2014-06-261-0/+3
|\ \ \
| * | | HLS: only queue discontinuity for first blockChong Zhang2014-06-251-0/+3
* | | | libstagefright: 64-bit compile warningsMark Salyzyn2014-06-2628-136/+170
* | | | Parse trex and mehd boxesMarco Nelissen2014-06-233-16/+133
|/ / /
* | | Merge "Fail more gracefully on allocation failure"Marco Nelissen2014-06-171-7/+26
|\ \ \ | |_|/ |/| |
| * | Fail more gracefully on allocation failureMarco Nelissen2014-06-171-7/+26
* | | Merge "Fix logging"Marco Nelissen2014-06-161-4/+4
|\ \ \ | |/ /
| * | Fix loggingMarco Nelissen2014-06-131-4/+4
* | | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-142-0/+7
|\ \ \
| * | | support for CEA-608 closed captionChong Zhang2014-06-132-0/+7
* | | | Merge "refactor getTrackInfo()"Chong Zhang2014-06-125-35/+57
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | refactor getTrackInfo()Chong Zhang2014-06-135-35/+57
* | | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-122-17/+5
|\ \ \
| * \ \ am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-122-17/+5
| |\ \ \
| | * \ \ Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-112-17/+5
| | |\ \ \
| | | * | | Offer a type-safe album art interface.Elliott Hughes2014-06-112-17/+5
* | | | | | am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-111-3/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-101-3/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-101-3/+0
| | |/ / /
* | | | | resolved conflicts for merge of 281b884c to masterChristopher Ferris2014-06-111-0/+7
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | am d3af4265: Merge "Link libcrypto for MD5_* functions."Christopher Ferris2014-06-101-0/+7
| |\ \ \ | | |/ /
| | * | Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
| * | | 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
* | | | | Merge "Remove unneeded code"Marco Nelissen2014-06-101-6/+0
|\ \ \ \ \
| * | | | | Remove unneeded codeMarco Nelissen2014-06-101-6/+0
* | | | | | add back HEVC SoftOMX decoderLajos Molnar2014-06-063-0/+853
* | | | | | Remove SoftOMX HEVC decoderLajos Molnar2014-06-063-849/+0
* | | | | | am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for HEVC...Lajos Molnar2014-06-069-8/+1023
|\ \ \ \ \ \
| * \ \ \ \ \ Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-pr...Lajos Molnar2014-06-069-8/+1023
| |\ \ \ \ \ \
| | * | | | | | stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-069-8/+1023
* | | | | | | | Merge "Guard against malformed files"Marco Nelissen2014-06-061-4/+28
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Guard against malformed filesMarco Nelissen2014-06-061-4/+28
* | | | | | | | Merge "do not drop TS packet on discontinuity at payload start"Chong Zhang2014-06-061-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | do not drop TS packet on discontinuity at payload startChong Zhang2014-06-061-1/+3
* | | | | | | | Merge "Make AAC decoder behavior after flush consistent with non-flush"Marco Nelissen2014-06-061-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make AAC decoder behavior after flush consistent with non-flushMarco Nelissen2014-06-051-0/+1
* | | | | | | | am 270facca: We still need the raw codecMarco Nelissen2014-06-051-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | We still need the raw codecMarco Nelissen2014-06-051-0/+1
* | | | | | | am 9042b116: Merge "MediaCodecList: remove force-added codecs for videoeditor...Lajos Molnar2014-06-051-5/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-5/+0
| |/ / / / /
| * | | | | DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormatVignesh Venkatasubramanian2014-05-291-0/+18
| | |_|_|/ | |/| | |
* | | | | am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+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
| | |\ \ \