* commit '28ff439e':
  mvi: Add sanity checking for the audio frame size

Conflicts:
	libavformat/mvi.c

See: ea1d8465Merged-by: Michael Niedermayer <michaelni@gmx.at>