Minor patches to support older ffmpeg under distro's like Ubuntu 12.04