Merge master.
[dcpomatic.git] / src / lib / ffmpeg.cc
2013-06-21 Carl HetheringtonSplit examiner parts off decoder.