diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 10:38:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 10:38:40 +0200 |
| commit | f54d751f33375054d4ecf30301ef008c8e781f99 (patch) | |
| tree | 2c464aaf76fbb32bb24e7855bc7062681d07f7a1 /libavformat/bmv.c | |
| parent | f0606a28deca304462349f623118a79069938339 (diff) | |
| parent | 0f310a6f333b016d336674d086045e8473fdf918 (diff) | |
| download | ffmpeg-f54d751f33375054d4ecf30301ef008c8e781f99.tar.gz | |
Merge commit '0f310a6f333b016d336674d086045e8473fdf918'
* commit '0f310a6f333b016d336674d086045e8473fdf918':
rmdec: Validate the fps value
Conflicts:
libavformat/rmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bmv.c')
0 files changed, 0 insertions, 0 deletions