Google Git
Sign in
aomedia/avm/dab7515aa4860e201bde9e2c8406c4e15819b65b
commit
dab7515aa4860e201bde9e2c8406c4e15819b65b
[log] [tgz]
author
Yaowu Xu <yaowu@google.com>
Wed Dec 16 08:03:59 2015 -0800
committer
Yaowu Xu <yaowu@google.com>
Wed Dec 16 09:00:57 2015 -0800
tree
7e6d131d140bf20aacff47d93418c5b1422be87e
parent
d6695b8a0e109b62127d006b8f7474b26c7490c0 [diff]
parent
eace551c8738b878d3649f70d82dd13ca3a96a29 [diff]
Merge branch 'master' into nextgenv2

With a few manual fixes of merge conflicts.

Change-Id: I0dd65ff90f9fa8606e5563f528659e2607b12376
tree: 7e6d131d140bf20aacff47d93418c5b1422be87e
  1. build/
  2. examples/
  3. test/
  4. third_party/
  5. tools/
  6. vp10/
  7. vp8/
  8. vp9/
  9. vpx/
  10. vpx_dsp/
  11. vpx_mem/
  12. vpx_ports/
  13. vpx_scale/
  14. vpx_util/
  15. .gitattributes
  16. .gitignore
  17. .mailmap
  18. args.c
  19. args.h
  20. AUTHORS
  21. CHANGELOG
  22. codereview.settings
  23. configure
  24. docs.mk
  25. examples.mk
  26. ivfdec.c
  27. ivfdec.h
  28. ivfenc.c
  29. ivfenc.h
  30. keywords.dox
  31. libs.doxy_template
  32. libs.mk
  33. LICENSE
  34. mainpage.dox
  35. md5_utils.c
  36. md5_utils.h
  37. PATENTS
  38. rate_hist.c
  39. rate_hist.h
  40. README
  41. solution.mk
  42. tools_common.c
  43. tools_common.h
  44. usage.dox
  45. usage_cx.dox
  46. usage_dx.dox
  47. video_common.h
  48. video_reader.c
  49. video_reader.h
  50. video_writer.c
  51. video_writer.h
  52. vpxdec.c
  53. vpxenc.c
  54. vpxenc.h
  55. vpxstats.c
  56. vpxstats.h
  57. warnings.c
  58. warnings.h
  59. webmdec.cc
  60. webmdec.h
  61. webmenc.cc
  62. webmenc.h
  63. y4menc.c
  64. y4menc.h
  65. y4minput.c
  66. y4minput.h