Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.

Need to go back at some point and fix this for real.