[FFmpeg-cvslog] Merge commit '6fc8226e29055858f28973bb3d27b63b3b65e616'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 16 14:06:28 2013 +0200| [b3970b39491ffab25a9c922f384855aca81d50b2] | committer: Michael Niedermayer

Merge commit '6fc8226e29055858f28973bb3d27b63b3b65e616'

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

Conflicts:
	libavcodec/vp3.c

See: a56d963f111b1a192cdabb05500f8083bd77ca93
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3970b39491ffab25a9c922f384855aca81d50b2
---