summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE libvpx: Cherry-pick 8b4c315 from upstreamcm-12.1Vignesh Venkatasubramanian2016-11-151-0/+1
* DO NOT MERGE | libvpx: Cherry-pick 0f42d1f from upstreamVignesh Venkatasubramanian2016-11-151-2/+6
* DO NOT MERGE | libvpx: cherry-pick aa1c813 from upstreamVignesh Venkatasubramanian2016-09-121-5/+14
* DO NOT MERGE - external/libvpx/libwebm: Update snapshotVignesh Venkatasubramanian2016-06-132-1629/+1047
* Merge tag 'android-5.1.1_r35' into HEADJessica Wagantall2016-03-07808-49712/+249746
|\
| * Merge Conflict Fix CL to lmp-mr1-release for ag/849478Vignesh Venkatasubramanian2016-01-22808-49714/+249737
| * Try to CP ag/749963 from klp-dev into lmp-mr1-releaseBaligh Uddin2015-09-012-3/+2
* | Merge tag 'android-5.1.1_r23' into cm-12.1Ricardo Cerqueira2015-10-052-3/+2
|\ \
| * | Try to CP ag/749963 from klp-dev into lmp-mr1-releaseBaligh Uddin2015-09-012-3/+2
| |/
* | Merge tag 'android-5.1.1_r5' into cm-12.1Ricardo Cerqueira2015-07-0416-1405/+35
|\ \
| * | am 69f5594e: (-s ours) Cherry-pick "Use lrand48 on Android" [DO NOT MERGE]Johann2015-01-230-0/+0
| |\|
| * | am 470ef077: (-s ours) Turn on libvpx x86 optimizations [DO NOT MERGE]Johann2015-01-230-0/+0
| |\ \
* | | | Use the prebuilts version of yasm to avoid host installstable/cm-12.1-YOG3Cdhacker292015-04-091-0/+2
| |_|/ |/| |
* | | Cherry-pick "Use lrand48 on Android" [DO NOT MERGE]Johann2015-01-218-34/+15
| |/ |/|
* | Turn on libvpx x86 optimizations [DO NOT MERGE]Johann2015-01-219-2/+1391
|/
* allow subtitle tracks with ContentEncodingsLajos Molnar2015-01-131-1/+1
* libwebm: Pull from upstreamstaging/cm-12.0-cafstaging/cm-12.0Vignesh Venkatasubramanian2014-06-232-6722/+5331
* am a18cc111: am 56235cbd: Merge commit \'4fb68e5dd4e93c7599dc905d861de11ac39c...Bill Yi2014-05-220-0/+0
|\
| * am 56235cbd: Merge commit \'4fb68e5dd4e93c7599dc905d861de11ac39c5585\' into HEADBill Yi2014-05-220-0/+0
| |\
| | * Merge commit '4fb68e5dd4e93c7599dc905d861de11ac39c5585' into HEADBill Yi2014-05-21848-107307/+68243
| | |\
* | | | UUIDs can have their high bit setMarco Nelissen2014-04-111-3/+4
* | | | am 70433872: am 4fb68e5d: Roll latest libvpx to fix hang when doing adaptive ...hkuang2014-04-100-0/+0
|\| | |
| * | | am 4fb68e5d: Roll latest libvpx to fix hang when doing adaptive playback.hkuang2014-04-10131-4260/+6019
| |\ \ \ | | | |/ | | |/|
| | * | Roll latest libvpx to fix hang when doing adaptive playback.hkuang2014-04-10131-4260/+6019
* | | | Roll latest libvpx to fix hang when doing adaptive playback.hkuang2014-04-09137-4373/+6019
* | | | am 7616a7e2: am 2ec72e65: libvpx: Roll latest libvpxVignesh Venkatasubramanian2014-03-270-0/+0
|\| | |
| * | | am 2ec72e65: libvpx: Roll latest libvpxVignesh Venkatasubramanian2014-03-27834-105293/+64470
| |\| | | | |/ | |/|
| | * libvpx: Roll latest libvpxVignesh Venkatasubramanian2014-03-26834-105293/+64470
* | | libvpx: Roll latest libvpxVignesh Venkatasubramanian2014-03-20116-1549/+19530
* | | resolved conflicts for merge of b2e48fbe to masterYing Wang2014-03-138-57/+145
|\| |
| * | Merge "Enable multilib build."Narayan Kamath2014-03-138-57/+145
| |\ \
| | * | Enable multilib build.Ying Wang2014-03-128-57/+145
| |/ /
* | | libvpx: Roll latest libvpx and enable VP9 EncoderVignesh Venkatasubramanian2014-03-11802-104504/+45816
* | | libwebm: Updating mkvparser from upstreamVignesh Venkatasubramanian2014-02-202-9514/+10691
* | | am 827804f7: Merge "libvpx: convert makefiles to support multilib build"Colin Cross2014-02-192-50/+60
|\| |
| * | Merge "libvpx: convert makefiles to support multilib build"Colin Cross2014-02-192-50/+60
| |\ \
| | * | libvpx: convert makefiles to support multilib buildColin Cross2014-02-182-50/+60
| |/ /
* | | am 93646e36: Merge "Remove LOCAL_CFLAGS set for MIPS as they are no longer re...Elliott Hughes2014-02-121-6/+0
|\| |
| * | Merge "Remove LOCAL_CFLAGS set for MIPS as they are no longer required."Elliott Hughes2014-02-121-6/+0
| |\ \ | | |/ | |/|
| | * Remove LOCAL_CFLAGS set for MIPS as they are no longer required.Raghu Gandham2013-11-251-6/+0
* | | am 9b352494: Roll latest libvpx to fix scalling bug. Checkout is from master:...hkuang2013-11-1477-1407/+7844
|\| |
| * | Roll latest libvpx to fix scalling bug.hkuang2013-11-1477-1407/+7844
* | | am 5ae7ac49: Roll latest libvpx into Android.hkuang2013-11-13422-74363/+55285
|\| |
| * | Roll latest libvpx into Android.hkuang2013-11-08422-74363/+55285
* | | Build the libvpx in arm mode and -O3 to get best performance.hkuang2013-10-241-0/+4
* | | am e6eeaaa1: Support bilinear filter in VP9Johann2013-10-041-1/+2
|\| |
| * | Support bilinear filter in VP9Johann2013-10-021-1/+2
* | | am 1184aebb: Roll latest libvpx into Android.hkuang2013-09-200-0/+0
|\| |
| * | Roll latest libvpx into Android.hkuang2013-09-17189-9643/+16429
* | | Roll latest libvpx into Android.hkuang2013-09-16189-9643/+16429
|/ /