* commit 'fcb07e8b':
  lavc: remove disabled FF_API_MMI cruft

Conflicts:
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>