Google Git
Sign in
aomedia / avm / 127f0a0c5f16851aa60d8b13b884cc39516963b3
commit127f0a0c5f16851aa60d8b13b884cc39516963b3[log] [tgz]
authorYaowu Xu <yaowu@google.com>Thu Jan 30 09:33:24 2014 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>Thu Jan 30 09:33:24 2014 -0800
tree28dde54228d0f5e0c4483654b911e1e5aad90f4e
parente127bb8a2bb62b197add999208f56c5850d69089 [diff]
parent4c0a62312430eeb2b2d59d5ffab95770c4b01f1a [diff]
Merge "Fix some automerge artifacts"
tree: 28dde54228d0f5e0c4483654b911e1e5aad90f4e
  1. build/
  2. examples/
  3. nestegg/
  4. test/
  5. third_party/
  6. tools/
  7. vp8/
  8. vp9/
  9. vpx/
  10. vpx_mem/
  11. vpx_ports/
  12. vpx_scale/
  13. .gitattributes
  14. .gitignore
  15. .mailmap
  16. args.c
  17. args.h
  18. AUTHORS
  19. CHANGELOG
  20. configure
  21. docs.mk
  22. examples.mk
  23. ivfdec.c
  24. ivfdec.h
  25. ivfenc.c
  26. ivfenc.h
  27. keywords.dox
  28. libs.doxy_template
  29. libs.mk
  30. LICENSE
  31. mainpage.dox
  32. md5_utils.c
  33. md5_utils.h
  34. PATENTS
  35. rate_hist.c
  36. rate_hist.h
  37. README
  38. resize_util.c
  39. solution.mk
  40. tools_common.c
  41. tools_common.h
  42. usage.dox
  43. usage_cx.dox
  44. usage_dx.dox
  45. vp8_scalable_patterns.c
  46. vp9_spatial_scalable_encoder.c
  47. vpxdec.c
  48. vpxenc.c
  49. vpxenc.h
  50. vpxstats.c
  51. vpxstats.h
  52. warnings.c
  53. warnings.h
  54. webmdec.c
  55. webmdec.h
  56. webmenc.c
  57. webmenc.h
  58. y4menc.c
  59. y4menc.h
  60. y4minput.c
  61. y4minput.h