summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would adve...Andreas Huber2011-12-011-1/+1
|\
| * Fixes a typo in AVIExtractor that would advertise the wrong video dimensionsAndreas Huber2011-12-011-1/+1
* | am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bi...Jamie Gennis2011-11-301-1/+1
|\ \ | |/
| * Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1Jamie Gennis2011-11-291-1/+1
| |\
| | * SurfaceMediaSource: use the vid enc usage bitJamie Gennis2011-11-211-1/+1
* | | Fix the broken buildJames Dong2011-11-291-3/+3
* | | am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from rea...Andreas Huber2011-11-291-0/+32
|\ \ \ | |/ /
| * | Merge "If an error occurs that prevents us from reallocating buffers during a...Andreas Huber2011-11-291-0/+32
| |\ \
| | * | If an error occurs that prevents us from reallocating buffers during a format...Andreas Huber2011-11-281-0/+32
* | | | resolved conflicts for merge of 998a929a to masterAndreas Huber2011-11-295-40/+92
|\ \ \ \ | |/ / /
| * | | Finer granularity discontinuity support.Andreas Huber2011-11-285-40/+92
| |/ /
* | | split ComposerService out of SurfaceComposerClient.hMathias Agopian2011-11-281-0/+2
* | | Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."James Dong2011-11-221-6/+11
|\ \ \
| * | | Fix a subtitle bug: multiple blank lines in SubRip(srt) file.Insun Kang2011-11-221-6/+11
* | | | am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting ...Andreas Huber2011-11-221-57/+87
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Report a runtime error instead of asserting on malformed avc configura...Andreas Huber2011-11-221-57/+87
| |\ \
| | * | Report a runtime error instead of asserting on malformed avc configuration data.Andreas Huber2011-11-181-57/+87
* | | | am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video rec...James Dong2011-11-212-10/+15
|\ \ \ \ | |/ / /
| * | | Fix log spamming during time lapse video recordingJames Dong2011-11-212-10/+15
| | |/ | |/|
| * | am d4b22ab4: status_t != boolMarco Nelissen2011-11-181-2/+2
| |\ \ | | |/ | |/|
| | * status_t != boolMarco Nelissen2011-11-181-2/+2
* | | status_t != boolMarco Nelissen2011-11-181-2/+2
* | | am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS not...Andreas Huber2011-11-172-8/+9
|\ \ \ | |/ /
| * | Make sure not to cancel pending seek/EOS notifications on a cache underrun...Andreas Huber2011-11-162-8/+9
* | | am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1Andreas Huber2011-11-111-1/+1
|\ \ \ | |/ /
| * | Didn't mean to check this in...Andreas Huber2011-11-111-1/+1
* | | am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error...Andreas Huber2011-11-111-2/+15
|\ \ \ | |/ /
| * | Merge "Instead of asserting, signal a runtime error if the session doesn't co...Andreas Huber2011-11-111-2/+15
| |\ \
| | * | Instead of asserting, signal a runtime error if the session doesn't containAndreas Huber2011-11-101-2/+15
| * | | Merge "DO NOT MERGE: Instead of asserting, remove active streams if their soc...Andreas Huber2011-11-111-15/+47
| |\ \ \
| | * | | DO NOT MERGE: Instead of asserting, remove active streams if their socketsAndreas Huber2011-11-101-15/+47
| | |/ /
* | | | am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP contr...Andreas Huber2011-11-112-64/+72
|\ \ \ \ | |/ / /
| * | | Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1Andreas Huber2011-11-112-64/+72
| |\ \ \
| | * | | Disconnect on socket error on the RTSP control connection.Andreas Huber2011-11-102-64/+72
| | |/ /
* | | | am 510180f1: am 08e42967: Merge "Add support for retrieving location informat...James Dong2011-11-112-0/+36
|\ \ \ \ | |/ / /
| * | | Add support for retrieving location information in mp4/3gpp filesJames Dong2011-11-102-0/+36
| |/ /
* | | Merge "Adds handler type 'sbtl' to support subtitles in various containers."James Dong2011-11-101-2/+3
|\ \ \
| * | | Adds handler type 'sbtl' to support subtitles in various containers.Insun Kang2011-11-101-2/+3
* | | | am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requ...Andreas Huber2011-11-101-2/+92
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Send RTSP control connection keep-alive requests" into ics-mr1Andreas Huber2011-11-101-2/+92
| |\ \ \
| | * | | Send RTSP control connection keep-alive requestsAndreas Huber2011-11-081-2/+92
* | | | | am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." in...Andreas Huber2011-11-101-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Don't believe the PV decoder's lies..." into ics-mr1Andreas Huber2011-11-101-1/+6
| |\ \ \ \
| | * | | | Don't believe the PV decoder's lies...Andreas Huber2011-11-091-1/+6
| | |/ / /
* | | | | am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to d...Andreas Huber2011-11-102-8/+11
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | There's no point in trying to continue to decode after an error was signalled.Andreas Huber2011-11-092-8/+11
| |/ /
* | | Merge "Instead of asserting, remove active streams if their sockets return fa...Andreas Huber2011-11-091-15/+47
|\ \ \
| * | | Instead of asserting, remove active streams if their sockets return failureAndreas Huber2011-11-091-15/+47
* | | | resolved conflicts for merge of 26f70db9 to masterAndreas Huber2011-11-082-11/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Remove surface legacy APIs and code." into ics-mr1Andreas Huber2011-11-082-11/+0
| |\ \
generated by cgit v1.1 at 2024-06-19 17:05:15 +0000