summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Audio framework: support for audio pre processing"Eric Laurent2011-07-208-30/+114
|\
| * Audio framework: support for audio pre processingEric Laurent2011-07-188-30/+114
* | Merge "Let the media recording framework release the Camera object when it is...James Dong2011-07-201-15/+35
|\ \
| * | Let the media recording framework release the Camera object when it is the ownerJames Dong2011-07-201-15/+35
* | | Merge "MediaScanner: Do separate bulk inserts for different media types"Mike Lockwood2011-07-201-26/+49
|\ \ \
| * | | MediaScanner: Do separate bulk inserts for different media typesMike Lockwood2011-07-201-26/+49
* | | | Merge "Fix issue 5012047: silent mode mutes music"Eric Laurent2011-07-201-9/+16
|\ \ \ \
| * | | | Fix issue 5012047: silent mode mutes musicEric Laurent2011-07-191-9/+16
* | | | | Merge "MediaPlayer: add a disconnect from ANativeWindow"Jamie Gennis2011-07-201-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | MediaPlayer: add a disconnect from ANativeWindowJamie Gennis2011-07-191-0/+2
* | | | | Merge "Content found in the wild violated the MPEG4 systems specs"Andreas Huber2011-07-201-1/+19
|\ \ \ \ \
| * | | | | Content found in the wild violated the MPEG4 systems specsAndreas Huber2011-07-191-1/+19
| | |_|/ / | |/| | |
* | | | | Merge "Fix issue 4499450: Unknown Ringer Mode"Eric Laurent2011-07-192-0/+27
|\ \ \ \ \
| * | | | | Fix issue 4499450: Unknown Ringer ModeEric Laurent2011-07-192-0/+27
| | |_|/ / | |/| | |
* | | | | Merge "More HLS fixes"Andreas Huber2011-07-192-10/+30
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | More HLS fixesAndreas Huber2011-07-192-10/+30
| | |/ / | |/| |
* | | | use SurfaceTexture new scaling mode in SFMathias Agopian2011-07-193-0/+19
| |/ / |/| |
* | | Merge "Remove PV AVC decoder"James Dong2011-07-1919-11185/+0
|\ \ \
| * | | Remove PV AVC decoderJames Dong2011-07-1919-11185/+0
| |/ /
* | | Return the play stayed locked.Narayan Kamath2011-07-191-1/+3
|/ /
* | am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc...Conley Owens2011-07-181-1/+1
|\ \
| * \ am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWo...Conley Owens2011-07-181-1/+1
| |\ \
| | * \ am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"Conley Owens2011-07-181-1/+1
| | |\ \
| | | * \ Merge "stagefright aacenc: Mark codeWord as UWord16"Conley Owens2011-07-181-1/+1
| | | |\ \
| | | | * | stagefright aacenc: Mark codeWord as UWord16Martin Storsjo2011-04-231-1/+1
* | | | | | am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Inclu...Deckard Autoverifier2011-07-181-3/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h f...Deckard Autoverifier2011-07-181-3/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"Deckard Autoverifier2011-07-181-3/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "stagefright: Include stdlib.h for malloc/free"Deckard Autoverifier2011-07-181-3/+1
| | | |\ \ \
| | | | * | | stagefright: Include stdlib.h for malloc/freeMartin Storsjo2011-06-221-3/+1
* | | | | | | am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbe...Deckard Autoverifier2011-07-181-73/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a ...Deckard Autoverifier2011-07-181-73/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"Deckard Autoverifier2011-07-181-73/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "stagefright amrwbenc: Remove a duplicate, unused file"Deckard Autoverifier2011-07-181-73/+0
| | | |\ \ \ \
| | | | * | | | stagefright amrwbenc: Remove a duplicate, unused fileMartin Storsjo2011-06-231-73/+0
| | | | |/ / /
* | | | | | | am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc...Deckard Autoverifier2011-07-181-2/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the me...Deckard Autoverifier2011-07-181-2/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit s...Deckard Autoverifier2011-07-181-2/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"Deckard Autoverifier2011-07-181-2/+7
| | | |\ \ \ \
| | | | * | | | stagefright aacenc: Make the mem_malloc function 64-bit safeMartin Storsjo2011-06-221-2/+7
| | | | |/ / /
* | | | | | | am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only ...Deckard Autoverifier2011-07-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 o...Deckard Autoverifier2011-07-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 c...Deckard Autoverifier2011-07-181-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"Deckard Autoverifier2011-07-181-1/+1
| | | |\ \ \ \
| | | | * | | | stagefright: Only use __int64 on MSVC, not on all win32 compilersMartin Storsjo2011-06-221-1/+1
| | | | |/ / /
| * | | | | | am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Re...Conley Owens2011-07-18150-5154/+5154
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Conley Owens2011-07-18150-5154/+5154
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Conley Owens2011-07-18150-5154/+5154
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ /
| | | | * | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2011-04-23150-5154/+5154
* | | | | | Merge "MediaPlayer: add ANativeWindow (dis)connect calls"Jamie Gennis2011-07-181-5/+101
|\ \ \ \ \ \