Google Git
Sign in
aomedia/aom/0b710c8d1a4d60f49032a44def013dd6babecd13
commit
0b710c8d1a4d60f49032a44def013dd6babecd13
[log] [tgz]
author
John Koleszar <jkoleszar@google.com>
Tue Dec 21 07:54:10 2010 -0500
committer
John Koleszar <jkoleszar@google.com>
Tue Dec 21 07:54:10 2010 -0500
tree
70e5973a651042b00d51a7a3100212e57c084c3c
parent
eee331e7f3185b57a3c64d97b999422925064f49 [diff]
parent
6cb708d50162ea4d6337949bc75587e87cac51eb [diff]
Merge remote branch 'origin/master' into experimental

Conflicts:
	vp8/vp8_cx_iface.c

Change-Id: I76f302448f11b28772efd4b5643f86a7cc69a8c2
tree: 70e5973a651042b00d51a7a3100212e57c084c3c
  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. wince_wmain_adapter.cpp
  41. y4minput.c
  42. y4minput.h