diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:33:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:33:49 +0200 |
| commit | 72abfba88458b85d24d8b2cebf7f2c06166a834b (patch) | |
| tree | d0524693e86456ff6d1ce974b6ec5ebf194b8bdb /libswscale/x86/scale.asm | |
| parent | 83d2b7e9a25e719b22c6631c31c3fdcfc137fa75 (diff) | |
| parent | 0f678c0214dccb355ed8955077a2bea46984fbc8 (diff) | |
| download | ffmpeg-72abfba88458b85d24d8b2cebf7f2c06166a834b.tar.gz | |
Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'
* commit '0f678c0214dccb355ed8955077a2bea46984fbc8':
aic: Validate values read from the bitstream
Conflicts:
libavcodec/aic.c
See: 657875b145c788d29b8e3bf38f79264e657932ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/scale.asm')
0 files changed, 0 insertions, 0 deletions