Contrib: more complete patch against FLAC, made by Jonathan Yong