[FFmpeg-cvslog] Merge commit '73b03249133d6631520089798087cbd963eed9ca'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu Nov 19 14:07:23 2015 +0000| [c63847528219e8e14735ac4778d53242f58afb21] | committer: Derek Buitenhuis

Merge commit '73b03249133d6631520089798087cbd963eed9ca'

* commit '73b03249133d6631520089798087cbd963eed9ca':
  aiff: Support demuxing G.722 streams

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c63847528219e8e14735ac4778d53242f58afb21
---