diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 15:12:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 15:14:31 +0200 |
| commit | f657ca0d0b3be7b5b9015d86af241b9237709652 (patch) | |
| tree | d8e21ec842f895ee3842dd41c61c78d01a09afb0 /ffmpeg_opt.c | |
| parent | 2a930fa29ea2ae4d613159d3697a4c4d3c47679f (diff) | |
| parent | d8798276b65543d921adadf63cc7f5ba2d1604af (diff) | |
| download | ffmpeg-f657ca0d0b3be7b5b9015d86af241b9237709652.tar.gz | |
Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af'
* commit 'd8798276b65543d921adadf63cc7f5ba2d1604af':
r3d: Add more input value validation
Conflicts:
libavformat/r3d.c
See: 99b1b2b1c65969ee324d754ea47e04a0a3f685a8
See: df92ac18528bac4566fc4f5ba4d607c1265791ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions