summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platf...Jean-Baptiste Queru2012-01-251-3/+3
|\
| * Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"Jean-Baptiste Queru2012-01-251-3/+3
| |\
| | * stagefright aacenc: Fix type definitions for 64 bit platformsMartin Storsjo2012-01-131-3/+3
* | | am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit...Jean-Baptiste Queru2012-01-241-2/+7
|\ \ \ | |/ /
| * | Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"Jean-Baptiste Queru2012-01-241-2/+7
| |\ \
| | * | stagefright amrwbenc: Make the mem_malloc function 64-bit safeMartin Storsjo2012-01-131-2/+7
| | |/
* | | am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of fi...Jean-Baptiste Queru2012-01-2413-13/+13
|\ \ \ | |/ /
| * | Merge "stagefright aacenc: Add missing newlines at the end of files"Jean-Baptiste Queru2012-01-2413-13/+13
| |\ \
| | * | stagefright aacenc: Add missing newlines at the end of filesMartin Storsjo2012-01-1313-13/+13
| | |/
* | | am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"Jean-Baptiste Queru2012-01-241-1/+1
|\ \ \ | |/ /
| * | Merge "stagefright aacenc: Properly terminate a comment"Jean-Baptiste Queru2012-01-241-1/+1
| |\ \
| | * | stagefright aacenc: Properly terminate a commentMartin Storsjo2012-01-131-1/+1
| | |/
* | | am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"Jean-Baptiste Queru2012-01-191-1/+1
|\ \ \ | |/ /
| * | Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-191-1/+1
* | | am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"Jean-Baptiste Queru2012-01-19102-754/+754
|\ \ \ | |/ /
| * | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-19102-754/+754
* | | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"Jean-Baptiste Queru2012-01-1954-187/+187
|\ \ \ | |/ /
| * | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-1954-187/+187
* | | am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"Jean-Baptiste Queru2012-01-1945-146/+146
|\ \ \ | |/ /
| * | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1945-146/+146
* | | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"Jean-Baptiste Queru2012-01-1915-48/+48
|\ \ \ | |/ /
| * | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-1915-48/+48
* | | Merge ee4618bcJean-Baptiste Queru2012-01-19117-2100/+2100
|\ \ \ | |/ /
| * | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-19117-2100/+2100
| |/
* | am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing...Jean-Baptiste Queru2012-01-13133-5071/+5071
|\ \ | |/
| * stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-12133-5071/+5071
* | stagefright: limit audio gap for looped playbackEric Laurent2012-01-091-0/+4
|/
* SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
* Revert the following patches because they may lead to power regression becaus...James Dong2011-12-146-81/+25
* DO NOT MERGE: Support for parsing of "folded" RTSP header valuesAndreas Huber2011-12-132-9/+31
* Fix drm flag setting missed in false drm recognition fix.Jeff Tinker2011-12-091-0/+1
* Fixed the false drm recognition.James Dong2011-12-082-10/+17
* Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics...Andreas Huber2011-12-082-4/+31
|\
| * Don't perform RTSP seeks right away but queue them for 200msAndreas Huber2011-12-082-4/+31
* | Fix Bitreader "putBits" implementation, make sure we emulate timestampsAndreas Huber2011-12-084-13/+37
|/
* Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1Jeff Tinker2011-12-085-15/+63
|\
| * Fix ANRs due to Widevine DRM plugin sniff taking too long.Jeff Tinker2011-12-075-15/+63
* | Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.Andreas Huber2011-12-071-2/+2
* | Merge "Fix for issue 5712743 video editor functional test : testPreviewDuring...Hong Teng2011-12-061-1/+1
|\ \
| * | Fix for issue 5712743 video editor functional test : testPreviewDuringExport ...Hong Teng2011-12-061-1/+1
* | | Merge "New and improved silent mode on lockscreen." into ics-mr1Amith Yamasani2011-12-061-2/+8
|\ \ \
| * | | New and improved silent mode on lockscreen.Amith Yamasani2011-12-061-2/+8
* | | | Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for...James Dong2011-12-061-0/+8
|\ \ \ \
| * | | | DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync f...James Dong2011-12-051-0/+8
| |/ / /
* | | | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
|/ / /
* | | Properly identify how much metadata we need to cache in order to instantiateAndreas Huber2011-12-053-41/+136
* | | MTP: Add support for restricting PTP to only certain subdirectories of the st...Mike Lockwood2011-12-022-42/+157
* | | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT...Mike Lockwood2011-12-021-2/+4
* | | Merge "Further volume improvements." into ics-mr1Amith Yamasani2011-12-021-8/+2
|\ \ \ | |/ / |/| |
| * | Further volume improvements.Amith Yamasani2011-12-011-8/+2
| |/
generated by cgit v1.1 at 2024-12-24 19:47:52 +0000