summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT ...Andreas Huber2011-01-290-0/+0
|\
| * am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
| |\
| | * DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
* | | Merge 13212f83 from gingerbread-plus-aospJean-Baptiste Queru2011-01-291-1/+2
|\ \ \ | |/ /
| * | am 0ef57993: Merge "Fix issue 2988031." into gingerbreadEric Laurent2011-01-271-1/+2
| |\ \ | | |/
| | * Fix issue 2988031.Eric Laurent2011-01-271-1/+2
* | | am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose ...Andreas Huber2011-01-281-13/+0
|\ \ \
| * | | Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (a...Andreas Huber2011-01-281-13/+0
* | | | am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into hon...Andreas Huber2011-01-283-20/+46
|\ \ \ \ | |/ / /
| * | | More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
* | | | am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server...Andreas Huber2011-01-260-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM aud...Andreas Huber2011-01-261-1/+4
| |\ \ \ | | | |/ | | |/|
| | * | DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra...Andreas Huber2011-01-261-1/+4
* | | | am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with...Andreas Huber2011-01-261-1/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "This particular RTSP server streams MPEG4-LATM audio with extra traili...Andreas Huber2011-01-261-1/+4
| |\ \ \
| | * | | This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.Andreas Huber2011-01-261-1/+4
* | | | | am a13732e1: Merge "MTP: Fix month off by one error in date parsing and forma...Mike Lockwood2011-01-261-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "MTP: Fix month off by one error in date parsing and formatting code" i...Mike Lockwood2011-01-261-2/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | MTP: Fix month off by one error in date parsing and formatting codeMike Lockwood2011-01-261-2/+4
* | | | | am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video...James Dong2011-01-266-4/+35
|\ \ \ \ \ | |/ / / /
| * | | | Make sure that key frame is generated for timelapse video recording if there ...James Dong2011-01-266-4/+35
| |/ / /
* | | | am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from ...Jean-Michel Trivi2011-01-260-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am 2ba92c71: do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-267-27/+49
| |\ \ \ | | | |/ | | |/|
| | * | do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-267-27/+49
* | | | am 373d357a: Merge "More instrumentation to track down the hardware decoder n...Andreas Huber2011-01-262-2/+20
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "More instrumentation to track down the hardware decoder not shutting d...Andreas Huber2011-01-262-2/+20
| |\ \ \
| | * | | More instrumentation to track down the hardware decoder not shutting down bug.Andreas Huber2011-01-262-2/+20
* | | | | am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into...Andreas Huber2011-01-261-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Ignore errors returned from native_window_set_crop." into honeycombAndreas Huber2011-01-261-2/+3
| |\ \ \ \
| | * | | | Ignore errors returned from native_window_set_crop.Andreas Huber2011-01-261-2/+3
| | |/ / /
* | | | | am a9f27fa6: Merge "Protect notification callback parameters with a mutex." i...Andreas Huber2011-01-261-4/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Protect notification callback parameters with a mutex." into honeycombAndreas Huber2011-01-261-4/+14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Protect notification callback parameters with a mutex.Andreas Huber2011-01-261-4/+14
* | | | | am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not ...Andreas Huber2011-01-261-17/+79
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Linux sockets suck, closing a socket descriptor does not abort pending...Andreas Huber2011-01-261-17/+79
| |\ \ \ \
| | * | | | Linux sockets suck, closing a socket descriptor does not abort pending recv/s...Andreas Huber2011-01-261-17/+79
| | |/ / /
* | | | | am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS,...Andreas Huber2011-01-261-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Instead of not feeding the AudioTrack any data after EOS, play silence instead.Andreas Huber2011-01-261-1/+3
| |/ / /
* | | | am df836892: (-s ours) am 239fd805: Merge "fix [3361121] hang in glClear() - ...Mathias Agopian2011-01-250-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OT...Mathias Agopian2011-01-251-7/+1
| |\ \ \ | | | |/ | | |/|
| | * | fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)Mathias Agopian2011-01-251-7/+1
* | | | am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after w...Mike Lockwood2011-01-252-36/+35
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "StagefrightMediaScanner: Close metadata retriever after we are done sc...Mike Lockwood2011-01-252-36/+35
| |\ \ \
| | * | | StagefrightMediaScanner: Close metadata retriever after we are done scanningMike Lockwood2011-01-252-36/+35
* | | | | am 3115dad3: Merge "Report errors to applications if AudioRecord->start() fai...James Dong2011-01-253-13/+27
|\ \ \ \ \ | |/ / / /
| * | | | Report errors to applications if AudioRecord->start() failsJames Dong2011-01-253-13/+27
| |/ / /
* | | | am 4b440268: am c929677e: Merge "Increase the number of useful bits in the sp...Marco Nelissen2011-01-251-2/+7
|\ \ \ \ | | |/ / | |/| |
| * | | am c929677e: Merge "Increase the number of useful bits in the spectrum." into...Marco Nelissen2011-01-251-2/+7
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Increase the number of useful bits in the spectrum." into gingerbreadMarco Nelissen2011-01-251-2/+7
| | |\ \
| | | * | Increase the number of useful bits in the spectrum.Marco Nelissen2011-01-241-2/+7