Google Git
Sign in
aomedia/avm/c4e807ae2f60eed08811bc80d0763c489c8005c9
commit
c4e807ae2f60eed08811bc80d0763c489c8005c9
[log]
author
Jingning Han <jingning@google.com>
Tue Mar 25 09:54:32 2014 -0700
committer
Jingning Han <jingning@google.com>
Tue Mar 25 10:25:16 2014 -0700
tree
9465fd0cbb6a2004873868d68e47ad6b22413c71
parent
34a3628a459ed7489019252d3ca0f71746788a84 [diff]
Fix compiling errors due to git merge

There were a few conflicts between the new non-RD partition search
and recent clean-up patches, which were not caught by git control.
This commit fixed these issues.

Change-Id: Ieebefbd6c19d81d0d13e3c568877d5cce2ab7797
1 file changed
tree: 9465fd0cbb6a2004873868d68e47ad6b22413c71
  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.c
  56. webmdec.h
  57. webmenc.c
  58. webmenc.h
  59. y4menc.c
  60. y4menc.h
  61. y4minput.c
  62. y4minput.h