* commit '0ef1660a':
  sierravmd: Do sanity checking of frame sizes

Conflicts:
	libavformat/sierravmd.c

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