summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE | libvpx: cherry-pick aa1c813 from upstreamstable/cm-13.0-ZNH2KBVignesh Venkatasubramanian2016-09-081-5/+14
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/ex...staging/cm-13.0+r22Steve Kondik2016-03-101-1/+1
|\
| * Fix ParseElementHeader to support 0 payload elementsVignesh Venkatasubramanian2016-01-111-1/+1
* | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/ext...Steve Kondik2015-12-07929-88404/+148794
|\|
| * Merge "libvpx: Pull from upstream" into mnc-dr-devVignesh Venkatasubramanian2015-10-20927-86776/+147748
| |\
| | * libvpx: Pull from upstreamVignesh Venkatasubramanian2015-10-19927-86776/+147748
| |/ |/|
| * external/libvpx/libwebm: Update snapshotVignesh Venkatasubramanian2015-10-192-1628/+1046
|/
* am 9dbb3269: am 8a9c5a1d: am 4a94e3b4: am 217c6ceb: Merge commit \'efc44fee\'...Wei Jia2015-08-200-0/+0
|\
| * am 8a9c5a1d: am 4a94e3b4: am 217c6ceb: Merge commit \'efc44fee\' into HEADWei Jia2015-08-202-3/+2
| |\
| | * am 4a94e3b4: am 217c6ceb: Merge commit \'efc44fee\' into HEADWei Jia2015-08-182-3/+2
| | |\
| | | * am 217c6ceb: Merge commit \'efc44fee\' into HEADWei Jia2015-08-182-3/+2
| | | |\
| | | | * Merge commit 'efc44fee' into HEADWei Jia2015-08-172-3/+2
| | | | |\
| | | | | * Disable bilinear_predict4x4_neonJohann2015-08-142-3/+2
* | | | | | Disable bilinear_predict4x4_neonJohann2015-08-192-3/+2
* | | | | | am 16f9a4cb: Merge "Add MODULE_LICENSE"Conley Owens2015-03-181-0/+0
|\| | | | |
| * | | | | Merge "Add MODULE_LICENSE"Conley Owens2015-03-181-0/+0
| |\ \ \ \ \
| | * | | | | Add MODULE_LICENSEConley Owens2015-03-121-0/+0
| |/ / / / /
* | | | | | libwebm: Fix parser if UID high bit is setVignesh Venkatasubramanian2015-03-051-1/+1
* | | | | | am 9ded949d: (-s ours) am 69f5594e: Cherry-pick "Use lrand48 on Android" [DO ...Johann2015-01-220-0/+0
|\| | | | |
| * | | | | am 69f5594e: Cherry-pick "Use lrand48 on Android" [DO NOT MERGE]Johann2015-01-220-0/+0
| |\| | | |
| | * | | | Cherry-pick "Use lrand48 on Android" [DO NOT MERGE]Johann2015-01-218-34/+15
* | | | | | am f9a5c1b2: (-s ours) am 470ef077: (-s ours) Turn on libvpx x86 optimization...Johann2015-01-220-0/+0
|\| | | | |
| * | | | | am 470ef077: (-s ours) Turn on libvpx x86 optimizations [DO NOT MERGE]Johann2015-01-220-0/+0
| |\| | | |
| | * | | | Turn on libvpx x86 optimizations [DO NOT MERGE]Johann2015-01-219-2/+1391
* | | | | | am 03bb428a: am 004e13f2: allow subtitle tracks with ContentEncodingsLajos Molnar2015-01-131-1/+1
|\| | | | |
| * | | | | am 004e13f2: allow subtitle tracks with ContentEncodingsLajos Molnar2015-01-131-1/+1
| |\| | | |
| | * | | | allow subtitle tracks with ContentEncodingsLajos Molnar2015-01-131-1/+1
| | |/ / /
* | | | | am bb1f43c6: am 4d59fcfb: Merge "Suppress clang warning until upstream fix."Chih-Hung Hsieh2014-12-101-0/+3
|\| | | |
| * | | | am 4d59fcfb: Merge "Suppress clang warning until upstream fix."Chih-Hung Hsieh2014-12-101-0/+3
| |\ \ \ \
| | * \ \ \ Merge "Suppress clang warning until upstream fix."Chih-Hung Hsieh2014-12-091-0/+3
| | |\ \ \ \
| | | * | | | Suppress clang warning until upstream fix.Chih-Hung Hsieh2014-12-091-0/+3
| | |/ / / /
* | | | | | am dce19c03: am acfe8bb3: am 7fb54bb1: Merge "Add -no-integrated-as at local ...Chih-Hung Hsieh2014-10-260-0/+0
|\| | | | |
| * | | | | am acfe8bb3: am 7fb54bb1: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-260-0/+0
| |\| | | |
| | * | | | am 7fb54bb1: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-101-0/+6
| | |\ \ \ \
* | | | | | | am 4c6460b4: am 7fb54bb1: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-101-0/+6
|\| | | | | |
| * | | | | | am 7fb54bb1: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-101-0/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-101-0/+6
| | |\ \ \ \
| | | * | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-101-0/+6
| | |/ / / /
* | | | | | am 0e7430e0: am 9921efda: Merge "libvpx: disable accidentally enabled neon code"Glenn Kasten2014-09-010-0/+0
|\| | | | |
| * | | | | am 9921efda: Merge "libvpx: disable accidentally enabled neon code"Glenn Kasten2014-08-295-172/+68
| |\| | | |
| | * | | | Merge "libvpx: disable accidentally enabled neon code"Glenn Kasten2014-08-295-172/+68
| | |\ \ \ \
| | | * | | | libvpx: disable accidentally enabled neon codeVignesh Venkatasubramanian2014-08-295-172/+68
| | |/ / / /
* | / / / / libvpx: disable accidentally enabled neon codeVignesh Venkatasubramanian2014-08-295-172/+68
|/ / / / /
* | | | | am a695ee8b: Merge "libvpx: Pull from upstream"Lajos Molnar2014-08-29521-41388/+82936
|\| | | |
| * | | | Merge "libvpx: Pull from upstream"Lajos Molnar2014-08-29521-41388/+82936
| |\ \ \ \
| | * | | | libvpx: Pull from upstreamVignesh Venkatasubramanian2014-08-15521-41388/+82936
| |/ / / /
* | | | | am bbeabeb8: Merge "Cherry-pick "Use lrand48 on Android""Elliott Hughes2014-08-058-34/+15
|\| | | |
| * | | | Merge "Cherry-pick "Use lrand48 on Android""Elliott Hughes2014-08-058-34/+15
| |\ \ \ \
| | * | | | Cherry-pick "Use lrand48 on Android"Johann2014-08-058-34/+15
| |/ / / /
* | / / / am d64f247f: Merge "Turn on libvpx x86 optimizations"Lajos Molnar2014-07-319-2/+1391
|\| | | | | |/ / / |/| | |