Merge commit '73b03249133d6631520089798087cbd963eed9ca'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 19 Nov 2015 14:07:23 +0000 (14:07 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 19 Nov 2015 14:07:23 +0000 (14:07 +0000)
* commit '73b03249133d6631520089798087cbd963eed9ca':
  aiff: Support demuxing G.722 streams

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge