Segfault/regression on raspberry Pi

If I build VLC from master, I'm getting segfaults when trying to start some videos on my raspberry Pi.

I've done a bisect and the issue was introduced in commit fbb54457 . If I revert that commit and rebuild, then my videos play fine. I don't know what that commit was intending to do (kind of a vague message), but it's definitely causing segfaults for me.