summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for ti...James Dong2011-01-262-1/+5
|\
| * am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video...James Dong2011-01-262-1/+5
| |\
| | * Make sure that key frame is generated for timelapse video recording if there ...James Dong2011-01-262-1/+5
* | | am e328d1c0: am a9f27fa6: Merge "Protect notification callback parameters wit...Andreas Huber2011-01-261-4/+14
|\ \ \ | |/ /
| * | am a9f27fa6: Merge "Protect notification callback parameters with a mutex." i...Andreas Huber2011-01-261-4/+14
| |\ \ | | |/
| | * Protect notification callback parameters with a mutex.Andreas Huber2011-01-261-4/+14
* | | am 12b2dc90: am b1e0a870: Merge "Fix crashes caused by some input devices." i...Jeff Brown2011-01-251-1/+3
|\ \ \ | |/ /
| * | am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycombJeff Brown2011-01-251-1/+3
| |\ \ | | |/
| | * Merge "Fix crashes caused by some input devices." into honeycombJeff Brown2011-01-251-1/+3
| | |\
| | | * Fix crashes caused by some input devices.Jeff Brown2011-01-251-1/+3
* | | | am c80daa1b: am f10d9404: Merge "StagefrightMediaScanner: Close metadata retr...Mike Lockwood2011-01-251-4/+0
|\ \ \ \ | |/ / /
| * | | am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after w...Mike Lockwood2011-01-251-4/+0
| |\ \ \ | | |/ /
| | * | StagefrightMediaScanner: Close metadata retriever after we are done scanningMike Lockwood2011-01-251-4/+0
| | |/
* | | am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccele...Chet Haase2011-01-241-0/+33
|\ \ \ | |/ /
| * | am 67005b05: Merge "Use optimized display lists for all hwaccelerated renderi...Chet Haase2011-01-241-0/+33
| |\ \ | | |/
| | * Use optimized display lists for all hwaccelerated renderingChet Haase2011-01-241-0/+33
* | | am 3564d9ea: am 63d64a14: Merge "Properly rotate video that\'s marked as such...Andreas Huber2011-01-211-0/+2
|\ \ \ | |/ /
| * | am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded ...Andreas Huber2011-01-211-0/+2
| |\ \ | | |/
| | * Properly rotate video that's marked as such and decoded to a surface.Andreas Huber2011-01-211-0/+2
* | | am 9a62d902: am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviou...Andreas Huber2011-01-211-1/+4
|\ \ \ | |/ /
| * | am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honey...Andreas Huber2011-01-211-1/+4
| |\ \ | | |/
| | * Some tweaks to HTTP live / nuplayer behaviourAndreas Huber2011-01-211-1/+4
* | | am 612d7f3c: am a423d868: Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
|\ \ \ | |/ /
| * | am a423d868: Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
| |\ \ | | |/
| | * Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
| | |\
| | | * clean-up unneeded codeMathias Agopian2011-01-201-8/+1
* | | | am 5f668c6e: am 8b9df978: Merge "Fix getSwitchState." into honeycombJeff Brown2011-01-191-0/+9
|\ \ \ \ | |/ / /
| * | | am 8b9df978: Merge "Fix getSwitchState." into honeycombJeff Brown2011-01-191-0/+9
| |\ \ \ | | |/ /
| | * | Fix getSwitchState.Jeff Brown2011-01-191-0/+9
| | |/
* | | am 1324e3b1: am 4061c9aa: Merge "Fix the presentation video resolution when i...James Dong2011-01-191-2/+4
|\ \ \ | |/ /
| * | am 4061c9aa: Merge "Fix the presentation video resolution when it is differen...James Dong2011-01-191-2/+4
| |\ \ | | |/
| | * Fix the presentation video resolution when it is different from the actual im...James Dong2011-01-191-2/+4
* | | Merge "Add joystick support to framework."Jeff Brown2011-01-171-0/+16
|\ \ \ | |/ / |/| |
| * | Add joystick support to framework.Jeff Brown2011-01-171-0/+16
* | | am 307003a8: Merge "integrate videoeditor preview player." into honeycombDharmaray Kundargi2011-01-172-0/+7
|\ \ \ | | |/ | |/|
| * | Merge "integrate videoeditor preview player." into honeycombDharmaray Kundargi2011-01-172-0/+7
| |\ \
| | * | integrate videoeditor preview player.Dharmaray Kundargi2011-01-162-0/+7
* | | | am cf18c478: Merge "Implement SurfaceTexture frame-available callback." into ...Jamie Gennis2011-01-161-0/+13
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Implement SurfaceTexture frame-available callback.Jamie Gennis2011-01-161-0/+13
| |/
* | am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into hone...Mathias Agopian2011-01-141-1/+1
|\ \ | |/
| * Merge "Fix error reporting in Surface::cancelBuffer()" into honeycombMathias Agopian2011-01-141-1/+1
| |\
| | * Fix error reporting in Surface::cancelBuffer()Mathias Agopian2011-01-141-1/+1
* | | am 3defffe0: Merge "Fix remote GraphicBuffer allocation in SurfaceFlinger." i...Jamie Gennis2011-01-133-8/+89
|\ \ \ | |/ /
| * | Fix remote GraphicBuffer allocation in SurfaceFlinger.Jamie Gennis2011-01-133-8/+89
* | | am 21f62b9e: Merge "Add a method enable encryption." into honeycombJason parks2011-01-131-0/+1
|\ \ \ | |/ /
| * | Merge "Add a method enable encryption." into honeycombJason parks2011-01-131-0/+1
| |\ \
| | * | Add a method enable encryption.Jason parks2011-01-121-0/+1
| | |/
* | | am 103198a1: Merge "Implement crop & transform for SurfaceTexture." into hone...Jamie Gennis2011-01-121-0/+46
|\ \ \ | |/ /
| * | Merge "Implement crop & transform for SurfaceTexture." into honeycombJamie Gennis2011-01-121-0/+46
| |\ \
| | * | Implement crop & transform for SurfaceTexture.Jamie Gennis2011-01-121-0/+46
| | |/