From Rocco Martino, build fix for compiling against ffmpeg/trunk