This change was dependent on a different patch that
never actually made it into FFmpeg, and it actually
ended up breaking builds.

This reverts commit 70cf7bb9.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>