summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2018-01-29 11:57:00 -0800
committerJohann <johannkoenig@google.com>2018-01-29 11:57:00 -0800
commit7e75e8a622952422b54ce13a81f82c22d6bf7f2d (patch)
treeff1b1ed09c7d4f67ec483f358246ea66c574bf10 /LICENSE
parent2654afc16c02d3bfdf08c4924b4f112794fc7ee3 (diff)
parentf80be22a1099b2a431c2796f529bb261064ec6b4 (diff)
downloadlibvpx-7e75e8a622952422b54ce13a81f82c22d6bf7f2d.tar
libvpx-7e75e8a622952422b54ce13a81f82c22d6bf7f2d.tar.gz
libvpx-7e75e8a622952422b54ce13a81f82c22d6bf7f2d.tar.bz2
libvpx-7e75e8a622952422b54ce13a81f82c22d6bf7f2d.zip
Merge remote-tracking branch 'origin/mandarinduck' into HEAD
The following changes were not carried back from the release branch: commit f87a4594fbd0b19071a2befebf52d3f5fabd1a9e Revert "Add frame width & height to frame pkt. Add test." commit c5dc3373dbd442ea299bacf276c4258fa7ce0559 work around pic issue with gcc 6 BUG=webm:1490 Change-Id: Id3e15983d5565680c05a0c454544003a615a4d7f
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions