Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
[ffmpeg.git] / libavformat / ircam.h
2012-12-05 Paul B MaholIRCAM demuxer & muxer