avformat/Makefile, configure: fix --avformat-swscale and the removal of the