Merge commit 'f20141d73f08ed0c8e875bd993a7143e19b266e3'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 20:36:44 +0000 (21:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 20:38:13 +0000 (21:38 +0100)
commit23e91a1bfd7f47b343f41915a2c8b33d5c532562
tree2a1f369b064dfd5bc76aa59eb3bd36ba0c2ccf4f
parent155f4dd668b8a2a57f1f8dfe225977cdcc5de745
parentf20141d73f08ed0c8e875bd993a7143e19b266e3
Merge commit 'f20141d73f08ed0c8e875bd993a7143e19b266e3'

* commit 'f20141d73f08ed0c8e875bd993a7143e19b266e3':
  vorbis_parser: Include stdint.h in the header, to make it work standalone

See: e2e36a739d3ad0d207a31c76f414a912d08b1d6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>