am c1513f42: Merge "Move declaration of stream_type_t up earlier"

* commit 'c1513f42eecca54c385a6e63abe6ddcfff5c911c':
  Move declaration of stream_type_t up earlier