summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | MediaPlayer: add ANativeWindow (dis)connect callsJamie Gennis2011-07-141-5/+101
* | | | | | Merge "Add option to query hardware decoders only"Jean-Michel Trivi2011-07-181-16/+11
|\ \ \ \ \ \
| * | | | | | Add option to query hardware decoders onlyJean-Michel Trivi2011-07-181-16/+11
* | | | | | | Merge "Always consider playlists corresponding to different bandwidths differ...Andreas Huber2011-07-181-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Always consider playlists corresponding to different bandwidths different.Andreas Huber2011-07-151-0/+6
* | | | | | | | Merge "Fix seek behaviour at startup and teardown of media session that hasn'...Andreas Huber2011-07-182-3/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix seek behaviour at startup and teardown of media session that hasn't been ...Andreas Huber2011-07-152-3/+11
* | | | | | | | Merge "MTP: Use a single packet for the data phase"Mike Lockwood2011-07-183-80/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | MTP: Use a single packet for the data phaseMike Lockwood2011-07-173-80/+66
* | | | | | | | | Audio preprocessing wrapper for webrtc.Eric Laurent2011-07-172-0/+1641
|/ / / / / / / /
* | | | | | | | Merge "Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testProp...Rajneesh Chowdury2011-07-151-4/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH...Rajneesh Chowdury2011-07-151-4/+12
* | | | | | | | Merge "Use unsigned char to store table of contents retrieved from XING heade...Gloria Wang2011-07-152-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Use unsigned char to store table of contents retrieved from XING header.Gloria Wang2011-07-152-4/+4
* | | | | | | | | Merge "Refetch playlists according to the HLS specs, varying delay if playlis...Andreas Huber2011-07-152-15/+124
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Refetch playlists according to the HLS specs, varying delay if playlists unch...Andreas Huber2011-07-152-15/+124
* | | | | | | | | Merge "Bug 5031179 possible fix for assert in join"Glenn Kasten2011-07-151-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug 5031179 possible fix for assert in joinGlenn Kasten2011-07-141-2/+7
* | | | | | | | | | MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia filesMike Lockwood2011-07-151-1/+3
| |/ / / / / / / / |/| | | | | | | |