Merge commit '0f310a6f333b016d336674d086045e8473fdf918'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 08:38:40 +0000 (10:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 08:38:40 +0000 (10:38 +0200)
commitf54d751f33375054d4ecf30301ef008c8e781f99
tree2c464aaf76fbb32bb24e7855bc7062681d07f7a1
parentf0606a28deca304462349f623118a79069938339
parent0f310a6f333b016d336674d086045e8473fdf918
Merge commit '0f310a6f333b016d336674d086045e8473fdf918'

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

Conflicts:
libavformat/rmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rmdec.c