summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MPEG2TSWriter: Correctly add padding using the adaptation fieldPaul Fariello2012-08-151-6/+27
* Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"Jean-Baptiste Queru2012-08-131-1/+2
|\
| * amrnb: Restart the p_xn pointer when retraversing the array on overflowMartin Storsjo2012-07-101-1/+2
* | Merge "amrnb: Fix audio distortion in an AMR-NB clip"Jean-Baptiste Queru2012-08-131-1/+1
|\ \
| * | amrnb: Fix audio distortion in an AMR-NB clipPacketVideo CM2012-07-101-1/+1
| |/
* | Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-102-6/+40
|\ \
| * | MPEG2TSWriter: Write a proper CRC in PAT and PMTPaul Fariello2012-07-102-6/+40
* | | Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"Jean-Baptiste Queru2012-08-102-7/+19
|\ \ \ | |/ /
| * | MPEG2TSWriter: Write proper continuity counters for PAT and PMTPaul Fariello2012-07-102-7/+19
| |/
* | Merge "Fix initialization of audio mixer track resources for MIPS."Jean-Baptiste Queru2012-08-101-1/+5
|\ \
| * | Fix initialization of audio mixer track resources for MIPS.Paul Lind2012-08-011-1/+5
* | | Merge "Store correct time stamps in recorded mp4 files"Jean-Baptiste Queru2012-08-082-6/+17
|\ \ \
| * | | Store correct time stamps in recorded mp4 filesJohannes Carlsson2012-07-302-6/+17
| | |/ | |/|
* | | Merge "Correct ID3::StringSize calculation for UCS-2 data."Jean-Baptiste Queru2012-08-081-1/+2
|\ \ \
| * | | Correct ID3::StringSize calculation for UCS-2 data.Jesper Tragardh2012-07-111-1/+2
| |/ /
* | | Merge "avcenc: Remove redundant zero-initialization of allocated memory"Jean-Baptiste Queru2012-08-082-10/+0
|\ \ \
| * | | avcenc: Remove redundant zero-initialization of allocated memoryMartin Storsjo2012-07-122-10/+0
* | | | Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback f...Jean-Baptiste Queru2012-08-082-2/+5
|\ \ \ \ | |/ / /
| * | | avcenc: Initialize all memory allocated by the CBAVC_Malloc callback functionMartin Storsjo2012-07-122-2/+5
* | | | Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \ \
| * | | | avcenc: Remove useless castsMartin Storsjo2012-07-101-2/+2
| |/ / /
* | | | Merge "Initialize pool's buffer pointers to null."Jean-Baptiste Queru2012-08-081-0/+6
|\ \ \ \
| * | | | Initialize pool's buffer pointers to null.Truls Bengtsson2012-07-111-0/+6
| | |/ / | |/| |
* | | | Merge "avcenc: Fix indentation"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \ \
| * | | | avcenc: Fix indentationMartin Storsjo2012-07-101-2/+2
| |/ / /
* | | | Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"Jean-Baptiste Queru2012-08-087-35/+35
|\ \ \ \ | | |/ / | |/| |
| * | | avcenc: Switch malloc/free callbacks to use pointers instead of intsMartin Storsjo2012-07-107-35/+35
| |/ /
* | | Merge "mediacodec: Return an error on getOutputFormat if there is no output f...Jean-Baptiste Queru2012-08-081-1/+2
|\ \ \ | |_|/ |/| |
| * | mediacodec: Return an error on getOutputFormat if there is no output format yetMartin Storsjo2012-07-131-1/+2
| |/
* | Merge "Shutter sound is heard at the end of the recorded video"Eino-Ville Talvala2012-08-011-1/+1
|\ \ | |/ |/|
| * Shutter sound is heard at the end of the recorded videoPatric Frederiksen2012-07-101-1/+1
|/
* Reconcile with jb-releaseThe Android Open Source Project2012-07-030-0/+0
|\
| * merge in jb-release history after reset to jb-devThe Android Automerger2012-07-020-0/+0
| |\
* | \ am 109347d4: audioflinger: fix regression in attachAuxEffect().Eric Laurent2012-07-021-4/+1
|\ \ \ | |/ /
| * | audioflinger: fix regression in attachAuxEffect().Eric Laurent2012-07-021-4/+1
* | | am 717e1286: audioflinger: fix auxiliary effect attachmentEric Laurent2012-07-012-0/+65
|\ \ \ | |/ /
| * | audioflinger: fix auxiliary effect attachmentEric Laurent2012-06-292-0/+65
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-250-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-220-0/+0
| |\ \ | | |/ | |/|
* | | am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb...Jamie Gennis2012-06-222-60/+58
|\ \ \ | |/ /
| * | Merge "SurfaceMediaSource: keep refs to current buffers" into jb-devJamie Gennis2012-06-222-60/+58
| |\ \
| | * | SurfaceMediaSource: keep refs to current buffersJamie Gennis2012-06-222-60/+58
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
* | | | am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
| | |/ | |/|
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-160-0/+0
| |\ \ | | |/ | |/|
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| | | |\