* commit '6fc8226e':
  vp3: Check the framerate for validity

Conflicts:
	libavcodec/vp3.c

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