* commit '7ae9791b':
  avformat: bump version after mime_type change

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