Cope with some changes in the locations of the libavformat and libswscale headers.