OpenCV: 2.4.6.1 - Image Manipulation Toolkit

Updated ffmpeg patches to work with 2.4.6.1.
Readded CXX flags according to druidsbane's feedback.