The patch created patch files in the ffmpeg build directory, which did
absolutely nothing. Properly backported them.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Before:

prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib
includedir=/usr/include

After:

prefix=/usr
exec_prefix=/usr
libdir=${exec_prefix}/lib
includedir=${prefix}/include

Numbered the other patch file.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Signed-off-by: Ian Leonard <antonlacon@gmail.com>