Merge changes from topic 'missing-proto'
authorJames Zern <jzern@google.com>
Tue, 12 May 2015 19:02:05 +0000 (19:02 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 12 May 2015 19:02:05 +0000 (19:02 +0000)
commitf2378498627e3c4c76a18a32842ff1826b68a949
tree46bdb9d5c3212644c6fe0125260c15c57d2746d2
parent73de6ad522fcd465fe378e1b4d4cb369faee5901
parent5c337fd08a6ffcaaf87edeb84d7c5e7c1f04206c
Merge changes from topic 'missing-proto'

* changes:
  vpxenc: make some functions static
  vpxdec: make some functions static
  tools_common.h: fix get_vpx_decoder_count() proto
  tools_common.h: fix get_vpx_encoder_count() proto
  tools_common.h: fix usage_exit() prototype
examples/vp8_multi_resolution_encoder.c