Google Git
Sign in
aomedia/aom/924d06a0755fdbdd90883f3fcc16b837f00362d1
commit
924d06a0755fdbdd90883f3fcc16b837f00362d1
[log]
author
Yaowu Xu <yaowu@google.com>
Tue Apr 21 08:00:49 2015 -0700
committer
Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue Apr 21 08:00:49 2015 -0700
tree
238f64fbf07ce214cff3e8d4e1baf8c3d3a960e3
parent
391ecffed91200a5c48f0388ce494d70cc86fc37 [diff]
parent
b423a6b21293e2609268b3f430d3dedec0b68b3f [diff]
Merge "Resolve configuration conflict"
tree: 238f64fbf07ce214cff3e8d4e1baf8c3d3a960e3
  1. build/
  2. examples/
  3. test/
  4. third_party/
  5. tools/
  6. vp8/
  7. vp9/
  8. vpx/
  9. vpx_mem/
  10. vpx_ports/
  11. vpx_scale/
  12. .gitattributes
  13. .gitignore
  14. .mailmap
  15. args.c
  16. args.h
  17. AUTHORS
  18. CHANGELOG
  19. configure
  20. docs.mk
  21. examples.mk
  22. ivfdec.c
  23. ivfdec.h
  24. ivfenc.c
  25. ivfenc.h
  26. keywords.dox
  27. libs.doxy_template
  28. libs.mk
  29. LICENSE
  30. mainpage.dox
  31. md5_utils.c
  32. md5_utils.h
  33. PATENTS
  34. rate_hist.c
  35. rate_hist.h
  36. README
  37. solution.mk
  38. tools_common.c
  39. tools_common.h
  40. usage.dox
  41. usage_cx.dox
  42. usage_dx.dox
  43. video_common.h
  44. video_reader.c
  45. video_reader.h
  46. video_writer.c
  47. video_writer.h
  48. vpxdec.c
  49. vpxenc.c
  50. vpxenc.h
  51. vpxstats.c
  52. vpxstats.h
  53. warnings.c
  54. warnings.h
  55. webmdec.cc
  56. webmdec.h
  57. webmenc.cc
  58. webmenc.h
  59. y4menc.c
  60. y4menc.h
  61. y4minput.c
  62. y4minput.h