Fixes compilation with newer ffmpeg. Remove upstreamed patch. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit b1999ec133)
b1999ec133