ffmpeg upgrade to c17808c - must have updated mpeg in dependencies/ffmpeg... to work.
Merge branch 'ffmpeg' into 2.0.3-cp

Conflicts:
	.gitignore