Update to match new FFmpeg; fixes #1296.