summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."Mike Lockwood2014-06-021-1/+1
|\
| * MtpDatabase JNI: Fixed incorrect method name in ALOGE.Martin Blumenstingl2014-05-311-1/+1
* | am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectProperty...Mike Lockwood2014-06-021-4/+2
|\ \ | |/
| * MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().Martin Blumenstingl2014-05-311-4/+2
* | am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
|\ \ | |/
| * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
* | am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone ...Marco Nelissen2014-05-011-0/+7
|\ \ | |/
| * Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."Marco Nelissen2014-05-011-0/+7
| |\
| | * MetadataRetriever: Check null pointer to avoid tombstone crash.wang, biao2014-04-091-0/+7
* | | am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
|\ \ \ | |/ /
| * | Merge "Cast CallVoidMethod's size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| |\ \
| | * | Cast CallVoidMethod's size_t parameters to jintAshok Bhat2014-03-061-1/+1
* | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-292-34/+46
|\ \ \ \ | |/ / / |/| | |
| * | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
| |\ \ \
| * \ \ \ am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-111-3/+3
| |\ \ \ \
| * \ \ \ \ am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u...Narayan Kamath2014-03-111-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj...Marco Nelissen2014-03-082-34/+46
| |\ \ \ \ \ \
| | * | | | | | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-03-072-34/+46
| * | | | | | | am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | / / | | |_|_|_|/ / | |/| | | | |
| | * | | | | libexif is now libjheadMarco Nelissen2014-03-061-2/+2
* | | | | | | frameworks: 64 bit compile issuesMark Salyzyn2014-04-162-10/+13
* | | | | | | Remove code markersDmitriy Ivanov2014-04-152-34/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge "Cast CallMethod's size_t parameters to jint"Narayan Kamath2014-03-311-2/+2
|\ \ \ \ \ \
| * | | | | | Cast CallMethod's size_t parameters to jintAshok Bhat2014-03-251-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | jni: 64-bit compile issueMark Salyzyn2014-03-261-5/+6
|/ / / / /
* | | | | mediaeditor shouldn't depend on audioflinger.Narayan Kamath2014-03-191-1/+0
| |_|_|/ |/| | |
* | | | Merge "Don't assume that size_t is 32-bit"Narayan Kamath2014-03-071-3/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't assume that size_t is 32-bitAshok Bhat2014-03-061-3/+3
| |/ /
* | | Don't use size_t for variables that store uint32_t valueAshok Bhat2014-03-061-3/+3
|/ /
* | Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
* | Merge "Release locked buffer when it fails to acquire graphics buffer"Zhijun He2014-01-301-0/+1
|\ \
| * | Release locked buffer when it fails to acquire graphics bufferlina.x.pi2014-01-281-0/+1
* | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
|/ /
* | AArch64: Use long for pointers in media classesAshok Bhat2014-01-159-128/+132
* | Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
|\ \
| * | Add NULL check in updateProxyConfigOscar Rydhé2013-12-191-8/+11
* | | Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-111-0/+1
|\ \ \
| * | | Fix a JNI local reference leak in MediaDrmPatrik2 Carlsson2013-12-191-0/+1
| |/ /
* | | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-073-24/+25
* | | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-072-36/+36
* | | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-072-53/+61
* | | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-071-14/+14
* | | Merge "MediaDrm#mNativeContext is a long, not int."Narayan Kamath2013-12-191-1/+1
|\ \ \ | |/ / |/| |
| * | MediaDrm#mNativeContext is a long, not int.Narayan Kamath2013-12-181-1/+1
* | | Remove unused field from MediaMuxerNarayan Kamath2013-12-181-7/+0
|/ /
* | AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-102-18/+18
* | Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2222-176/+1248
|\ \ | |/
| * Fix hangMarco Nelissen2013-09-251-1/+1
| * Add audio level monitoring capabilities in Visualizer effectJean-Michel Trivi2013-09-231-0/+72
| * ImageReader: disable NV21 supportZhijun He2013-09-181-3/+8