Previous faad2 contribs fix was incorrect. Fix has to be done in decoder module. This reverts commit 85f0e45b.