summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge "Use the target color format from the camera source if possible" into g...James Dong2010-08-051-4/+61
| | |\ \ | | | |/ | | |/|
| | | * Use the target color format from the camera source if possibleJames Dong2010-08-051-4/+61
* | | | am 41b29cb0: am 3aad8c38: Merge "Fix an issue where the track duration does n...James Dong2010-08-051-11/+12
|\ \ \ \ | |/ / /
| * | | am 3aad8c38: Merge "Fix an issue where the track duration does not include th...James Dong2010-08-051-11/+12
| |\ \ \ | | |/ /
| | * | Fix an issue where the track duration does not include the last sample durationJames Dong2010-08-051-11/+12
| | |/
* | | am 870678a9: am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H...Andreas Huber2010-08-054-7/+17
|\ \ \ | |/ /
| * | am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video no...Andreas Huber2010-08-054-7/+17
| |\ \ | | |/
| | * Merge "Better support for fake timestamps in RTP, H.263 video now also reques...Andreas Huber2010-08-054-7/+17
| | |\
| | | * Better support for fake timestamps in RTP, H.263 video now also requests FIR.Andreas Huber2010-08-054-7/+17
* | | | am 2405988f: am 407ec58c: Merge "A better fix for the OggExtractor referring ...Andreas Huber2010-08-051-2/+8
|\ \ \ \ | |/ / /
| * | | am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample...Andreas Huber2010-08-051-2/+8
| |\ \ \ | | |/ /
| | * | A better fix for the OggExtractor referring to the sample rate while it hasn'...Andreas Huber2010-08-051-2/+8
| | |/
* | | am c6d1519e: am fb861523: Merge "Specification of codec specific data as part...Andreas Huber2010-08-052-59/+14
|\ \ \ | |/ /
| * | am fb861523: Merge "Specification of codec specific data as part of the sessi...Andreas Huber2010-08-052-59/+14
| |\ \ | | |/
| | * Merge "Specification of codec specific data as part of the session descriptio...Andreas Huber2010-08-052-59/+14
| | |\
| | | * Specification of codec specific data as part of the session description is no...Andreas Huber2010-08-042-59/+14
* | | | am ef9fd39d: am 769f9b89: am 5b86de94: fix doc bugsScott Main2010-08-051-1/+1
|\ \ \ \ | |/ / /
| * | | am 769f9b89: am 5b86de94: fix doc bugsScott Main2010-08-041-1/+1
| |\ \ \ | | |/ /
| | * | am 5b86de94: fix doc bugsScott Main2010-08-041-1/+1
| | |\ \
| | | * | fix doc bugsScott Main2010-08-041-1/+1
* | | | | am 533dc786: am 7d146197: Merge "Fix divide by zero." into gingerbreadMarco Nelissen2010-08-051-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 7d146197: Merge "Fix divide by zero." into gingerbreadMarco Nelissen2010-08-041-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix divide by zero." into gingerbreadMarco Nelissen2010-08-041-1/+1
| | |\ \ \
| | | * | | Fix divide by zero.Marco Nelissen2010-08-041-1/+1
* | | | | | am ac8e7060: am 86d2c088: Merge "Don\'t return a decoder error if the encoded...Andreas Huber2010-08-052-130/+149
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does ...Andreas Huber2010-08-042-130/+149
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Don't return a decoder error if the encoded stream does not start with...Andreas Huber2010-08-042-130/+149
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Don't return a decoder error if the encoded stream does not start with SPS/PPS.Andreas Huber2010-08-042-130/+149
* | | | | | am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 ...Andreas Huber2010-08-0534-117/+2936
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and...Andreas Huber2010-08-0434-117/+2936
| |\ \ \ \ \ | | |/ / / /
| | * | | | Support for Gtalk video, includes AMR/H.263 assembler and packetization suppo...Andreas Huber2010-08-0434-117/+2936
| | |/ / /
* | | | | am eec3fca6: am 7629e8dd: Merge "Fix issue 2876124." into gingerbreadEric Laurent2010-08-051-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 7629e8dd: Merge "Fix issue 2876124." into gingerbreadEric Laurent2010-08-041-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix issue 2876124." into gingerbreadEric Laurent2010-08-041-1/+2
| | |\ \ \
| | | * | | Fix issue 2876124.Eric Laurent2010-08-041-1/+2
* | | | | | resolved conflicts for merge of acc4e683 to masterEric Laurent2010-08-059-173/+148
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1340ee8a: Merge "NEW_API: Unhide audio effect APIs." into gingerbreadEric Laurent2010-08-049-173/+148
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "NEW_API: Unhide audio effect APIs." into gingerbreadEric Laurent2010-08-049-173/+148
| | |\ \ \ \
| | | * | | | NEW_API: Unhide audio effect APIs.Eric Laurent2010-08-049-173/+148
| | | |/ / /
* | | | | | Merge changes I085cb3cf,Ied1cddc6Mike Lockwood2010-08-046-46/+228
|\ \ \ \ \ \
| * | | | | | MTP: Add support for syncing MTP playlistsMike Lockwood2010-08-035-8/+172
| * | | | | | MTP: Fix some thread safety issues in MTP server start/stop sequence.Mike Lockwood2010-08-031-38/+56
* | | | | | | Unhide MediaRecorder::setTimeLapseParameters()Nipun Kwatra2010-08-041-1/+2
* | | | | | | am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value wh...James Dong2010-08-041-1/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->s...James Dong2010-08-031-1/+7
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Replace CHECK with a failure return value when mCamera->setParameters() failsJames Dong2010-08-031-1/+7
* | | | | | | am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread n...James Dong2010-08-041-49/+215
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 3d84280c: Merge "File writer has a designated writer thread now" into ging...James Dong2010-08-031-49/+215
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "File writer has a designated writer thread now" into gingerbreadJames Dong2010-08-031-49/+215
| | |\ \ \ \ \
| | | * | | | | File writer has a designated writer thread nowJames Dong2010-08-021-49/+215