Google Git
Sign in
aomedia/avm/54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80
commit
54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80
[log]
author
John Koleszar <jkoleszar@google.com>
Fri May 20 08:33:51 2011 -0400
committer
John Koleszar <jkoleszar@google.com>
Fri May 20 08:33:51 2011 -0400
tree
fc5e50da5e0823be3e58d72773efe267b553c998
parent
a741e0e3cb63e3e4b398c8c275fd909836ec8074 [diff]
parent
1f3f18443db5820157448515579c14efd19eea1b [diff]
Merge remote branch 'origin/master' into experimental

Conflicts:
	configure

Change-Id: I91b9059e5b724a96368c7765c147fdf5a5ce03f2
tree: fc5e50da5e0823be3e58d72773efe267b553c998
  1. build/
  2. examples/
  3. libmkv/
  4. nestegg/
  5. tools/
  6. vp8/
  7. vpx/
  8. vpx_mem/
  9. vpx_ports/
  10. vpx_scale/
  11. .gitattributes
  12. .gitignore
  13. .mailmap
  14. args.c
  15. args.h
  16. AUTHORS
  17. CHANGELOG
  18. configure
  19. docs.mk
  20. example_xma.c
  21. examples.mk
  22. keywords.dox
  23. libs.doxy_template
  24. libs.mk
  25. LICENSE
  26. mainpage.dox
  27. md5_utils.c
  28. md5_utils.h
  29. PATENTS
  30. README
  31. solution.mk
  32. tools_common.c
  33. tools_common.h
  34. usage.dox
  35. usage_cx.dox
  36. usage_dx.dox
  37. vp8_api1_migration.txt
  38. vpxdec.c
  39. vpxenc.c
  40. y4minput.c
  41. y4minput.h