[FFmpeg-cvslog] Merge commit '0f310a6f333b016d336674d086045e8473fdf918'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 19 10:38:40 2013 +0200| [f54d751f33375054d4ecf30301ef008c8e781f99] | committer: Michael Niedermayer

Merge commit '0f310a6f333b016d336674d086045e8473fdf918'

* commit '0f310a6f333b016d336674d086045e8473fdf918':
  rmdec: Validate the fps value

Conflicts:
	libavformat/rmdec.c

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

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