summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am bd65c065: am a13732e1: Merge "MTP: Fix month off by one error in date pars...Mike Lockwood2011-01-261-2/+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 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for ti...James Dong2011-01-264-3/+30
|\ \ \ \ | |/ / /
| * | | am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video...James Dong2011-01-264-3/+30
| |\ \ \ | | |/ /
| | * | Make sure that key frame is generated for timelapse video recording if there ...James Dong2011-01-264-3/+30
| | |/
* | | am 11934aa3: am 373d357a: Merge "More instrumentation to track down the hardw...Andreas Huber2011-01-262-2/+20
|\ \ \ | |/ /
| * | 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 1a6e6d55: am 6df89fde: Merge "Ignore errors returned from native_window_se...Andreas Huber2011-01-261-2/+3
|\ \ \ \ | |/ / /
| * | | am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into...Andreas Huber2011-01-261-2/+3
| |\ \ \ | | |/ /
| | * | Ignore errors returned from native_window_set_crop.Andreas Huber2011-01-261-2/+3
| | |/
* | | am 38a1714b: am 7765c65d: Merge "Linux sockets suck, closing a socket descrip...Andreas Huber2011-01-261-17/+79
|\ \ \ | |/ /
| * | 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 807398e7: am d030359f: Merge "Instead of not feeding the AudioTrack any da...Andreas Huber2011-01-261-1/+3
|\ \ \ \ | |/ / /
| * | | 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 c80daa1b: am f10d9404: Merge "StagefrightMediaScanner: Close metadata retr...Mike Lockwood2011-01-251-32/+35
|\ \ \ | |/ /
| * | am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after w...Mike Lockwood2011-01-251-32/+35
| |\ \ | | |/
| | * Merge "StagefrightMediaScanner: Close metadata retriever after we are done sc...Mike Lockwood2011-01-251-32/+35
| | |\
| | | * StagefrightMediaScanner: Close metadata retriever after we are done scanningMike Lockwood2011-01-251-32/+35
* | | | am 45800cf9: am 3115dad3: Merge "Report errors to applications if AudioRecord...James Dong2011-01-253-13/+27
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | Merge "Bug 3117154"Glenn Kasten2011-01-251-1/+1
|\ \ \
| * | | Bug 3117154Glenn Kasten2011-01-251-1/+1
* | | | am 8952df72: am 4b440268: am c929677e: Merge "Increase the number of useful b...Marco Nelissen2011-01-251-2/+7
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 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
| | * | | am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.2...Andreas Huber2011-01-243-9/+23
| | |\ \ \ | | | |/ /
| | | * | DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software d...Andreas Huber2011-01-243-9/+23
| | | |/
| | * | am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instanti...Dave Sparks2011-01-202-3/+31
| | |\ \ | | | |/
| | | * DO NOT MERGE: Prefill the cache before trying to instantiate the media extrac...Andreas Huber2011-01-192-3/+31
| | * | am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not re...Andreas Huber2011-01-191-4/+81
| | |\ \ | | | |/
| | | * DO NOT MERGE: Apparently our native TCP sockets do not return an error from b...Andreas Huber2011-01-181-4/+81
| | * | merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-147-143/+48
| | |\ \ | | | |/
| | | * Squash commits of the following patches, cherry-picked from other branch - do...James Dong2011-01-127-143/+48
| | * | am 7c615360: Fail to parse duration instead of asserting, if the server respo...Andreas Huber2011-01-121-5/+7
| | |\ \ | | | |/
| | | * Fail to parse duration instead of asserting, if the server response cannot be...Andreas Huber2011-01-121-5/+7
| | * | am 7e2f9cc8: DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-113-75/+317
| | |\ \ | | | |/
| | | * DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-113-75/+317
| | * | resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosprepo sync2011-01-118-38/+689
| | |\ \ | | | |/
| | | * DO NOT MERGE: Fix parsing of ntp= PLAY response.Andreas Huber2011-01-118-39/+690
| | * | am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecOb...James Dong2011-01-102-5/+11
| | |\ \ | | | |/