Google Git
Sign in
android / platform / external / libaom / 105da4128
commit105da4128daba45a83eea7ef8cccfd7c86341961[log] [tgz]
authorYaowu Xu <yaowu@google.com>Fri Feb 05 07:50:57 2016 -0800
committerYaowu Xu <yaowu@google.com>Fri Feb 05 09:04:41 2016 -0800
tree72c5d4a9539da06037e6cc652ee6998cd71a826b
parent48b27135538bd74e81a01c25e1627a28e5389584 [diff]
Fix bad merge artifacts

Temporaly disable warning for unused function for vp10, needs clean
out the warnings before re-enable the flag for vp10.

Change-Id: I5636f8cd607423f6ea6963db9c2cbd688e30b495
3 files changed
tree: 72c5d4a9539da06037e6cc652ee6998cd71a826b
  1. build/
  2. examples/
  3. test/
  4. third_party/
  5. tools/
  6. vp10/
  7. vp8/
  8. vp9/
  9. vpx/
  10. vpx_dsp/
  11. vpx_mem/
  12. vpx_ports/
  13. vpx_scale/
  14. vpx_util/
  15. .gitattributes
  16. .gitignore
  17. .mailmap
  18. args.c
  19. args.h
  20. AUTHORS
  21. CHANGELOG
  22. codereview.settings
  23. configure
  24. docs.mk
  25. examples.mk
  26. ivfdec.c
  27. ivfdec.h
  28. ivfenc.c
  29. ivfenc.h
  30. keywords.dox
  31. libs.doxy_template
  32. libs.mk
  33. LICENSE
  34. mainpage.dox
  35. md5_utils.c
  36. md5_utils.h
  37. PATENTS
  38. rate_hist.c
  39. rate_hist.h
  40. README
  41. solution.mk
  42. tools_common.c
  43. tools_common.h
  44. usage.dox
  45. usage_cx.dox
  46. usage_dx.dox
  47. video_common.h
  48. video_reader.c
  49. video_reader.h
  50. video_writer.c
  51. video_writer.h
  52. vpxdec.c
  53. vpxenc.c
  54. vpxenc.h
  55. vpxstats.c
  56. vpxstats.h
  57. warnings.c
  58. warnings.h
  59. webmdec.cc
  60. webmdec.h
  61. webmenc.cc
  62. webmenc.h
  63. y4menc.c
  64. y4menc.h
  65. y4minput.c
  66. y4minput.h