Google Git
Sign in
aomedia / aom / 2eccbd0f4bb060c5ac3369c83bd0f02e39ad97c2
commit2eccbd0f4bb060c5ac3369c83bd0f02e39ad97c2[log] [tgz]
authorAlex Converse <aconverse@google.com>Thu Feb 13 17:02:50 2014 -0800
committerAlex Converse <aconverse@google.com>Thu Feb 13 17:05:13 2014 -0800
treef0e16996a15e275a1bcb0363ef14161c32596000
parent27f809db914dfb2e4bc108134a8ccd46a0ce8bd0 [diff]
Fix build error caused by a merge conflict.

Commit 70d9664f removed 'int i' required by a4f30a50.

Change-Id: I4e7e14e9e8532f753e43a57b5bba4589d58e0c32
1 file changed
tree: f0e16996a15e275a1bcb0363ef14161c32596000
  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. video_common.h
  46. video_reader.c
  47. video_reader.h
  48. video_writer.c
  49. video_writer.h
  50. vp9_spatial_scalable_encoder.c
  51. vpxdec.c
  52. vpxenc.c
  53. vpxenc.h
  54. vpxstats.c
  55. vpxstats.h
  56. warnings.c
  57. warnings.h
  58. webmdec.c
  59. webmdec.h
  60. webmenc.c
  61. webmenc.h
  62. y4menc.c
  63. y4menc.h
  64. y4minput.c
  65. y4minput.h