summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* libstagefright: fix possible overflow in ID3.Wei Jia2015-08-121-2/+5
* Check integer overflow to prevent memory corruptionJeff Tinker2015-08-111-1/+2
* Merge "NuPlayer: set video surface directly when NuPlayer has not started yet...Wei Jia2015-08-111-2/+5
|\
| * NuPlayer: set video surface directly when NuPlayer has not started yet.Wei Jia2015-08-101-2/+5
* | am 5aa85d05: am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba:...Nick Kralevich2015-08-081-1/+1
|\ \
| * \ am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed:...Nick Kralevich2015-08-081-1/+1
| |\ \
| | * \ am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e:...Nick Kralevich2015-08-081-1/+1
| | |\ \
| | | * \ am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591:...Nick Kralevich2015-08-081-1/+1
| | | |\ \
| | | | * \ am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b:...Nick Kralevich2015-08-081-1/+1
| | | | |\ \
| | | | | * \ am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37:...Nick Kralevich2015-08-081-1/+1
| | | | | |\ \
| | | | | | * \ am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098:...Nick Kralevich2015-08-081-1/+1
| | | | | | |\ \
| | | | | | | * \ am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b:...Nick Kralevich2015-08-081-1/+1
| | | | | | | |\ \
| | | | | | | | * \ am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36:...Nick Kralevich2015-08-081-1/+1
| | | | | | | | |\ \
| | | | | | | | | * \ am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209:...Nick Kralevich2015-08-081-1/+1
| | | | | | | | | |\ \
| | | | | | | | | | * \ am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size ...Nick Kralevich2015-08-081-1/+1
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAXNick Kralevich2015-08-071-1/+1
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAXNick Kralevich2015-08-071-1/+1
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * | MPEG4Extractor.cpp: handle chunk_size > SIZE_MAXNick Kralevich2015-08-071-1/+1
| | | | | | | * | | | | | | | am 905aae46: am 11c88f66: am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1:...Joshua J. Drake2015-08-071-0/+4
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / /
| | | | | | | | * | | | | | | am 11c88f66: am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1: am 3329a19b:...Joshua J. Drake2015-08-071-0/+4
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |/ / / / / /
| | | | | | | | | * | | | | | am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1: am 3329a19b: am c87faed6:...Joshua J. Drake2015-08-071-0/+4
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / /
| | | | | | | | | | * | | | | am e4ccf3a1: am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG4 pr...Joshua J. Drake2015-08-041-0/+4
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / /
| | | | | | | | | | | * | | | am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG4 processingJoshua J. Drake2015-08-041-0/+4
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | * | | am c87faed6: Fix integer underflow in covr MPEG4 processingJoshua J. Drake2015-08-041-0/+4
| | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | * | Fix integer underflow in covr MPEG4 processingJoshua J. Drake2015-08-041-0/+4
| | | | | | | * | | | | | | | am bcc8e581: am bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7:...Joshua J. Drake2015-08-071-0/+7
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / /
| | | | | | | | * | | | | | | am bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d:...Joshua J. Drake2015-08-071-0/+7
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |/ / / / / /
| | | | | | | | | * | | | | | am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd:...Joshua J. Drake2015-08-071-0/+7
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / /
| | | | | | | | | | * | | | | am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPE...Joshua J. Drake2015-08-041-0/+7
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / /
| | | | | | | | | | | * | | | am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atomJoshua J. Drake2015-08-041-0/+7
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | * | | am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atomJoshua J. Drake2015-08-041-0/+7
| | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | * | Fix integer overflow when handling MPEG4 tx3g atomJoshua J. Drake2015-08-041-0/+7
| | | | | | | * | | | | | | | am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-...Nick Kralevich2015-08-071-0/+3
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / /
| | | | | | | | * | | | | | | am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aospNick Kralevich2015-08-071-0/+3
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |/ / / / / /
| | | | | | | | | * | | | | | resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aospNick Kralevich2015-08-071-0/+3
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / /
| | | | | | | | | | * | | | | am 52d1defc: am 9481a101: am a81b3779: Prevent integer overflow when processi...Joshua J. Drake2015-08-041-0/+3
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / /
| | | | | | | | | | | * | | | am 9481a101: am a81b3779: Prevent integer overflow when processing covr MPEG4...Joshua J. Drake2015-08-041-0/+3
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | * | | am a81b3779: Prevent integer overflow when processing covr MPEG4 atomsJoshua J. Drake2015-08-041-0/+3
| | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | * | Prevent integer overflow when processing covr MPEG4 atomsJoshua J. Drake2015-08-041-0/+3
| * | | | | | | | | | | | | | am 648ec9da: am 92b5c47a: am 32739430: am fbf55d85: am 80c17e0d: am 450e1015:...Marco Nelissen2015-08-081-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 32739430: am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album artMarco Nelissen2015-08-081-4/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album artMarco Nelissen2015-08-081-4/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | am 80c17e0d: am 450e1015: Fix Ogg album artMarco Nelissen2015-08-081-4/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | am 450e1015: Fix Ogg album artMarco Nelissen2015-08-081-4/+9
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / /
| | | | | | * | | | | | | | | Fix Ogg album artMarco Nelissen2015-08-081-4/+9
| * | | | | | | | | | | | | | am 6323529b: am 2424d28b: am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd:...Marco Nelissen2015-08-081-3/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge "Extra sanity check...Marco Nelissen2015-08-081-3/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am af3c0475: am 9c67741f: am 2e637bfd: Merge "Extra sanity checks on sample s...Marco Nelissen2015-08-081-3/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | am 9c67741f: am 2e637bfd: Merge "Extra sanity checks on sample size and resol...Marco Nelissen2015-08-081-3/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | am 2e637bfd: Merge "Extra sanity checks on sample size and resolution" into k...Marco Nelissen2015-08-081-3/+15
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / /