diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:39:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:39:31 +0200 |
| commit | 57570052e244d12900caf6f65bb3dcca12817245 (patch) | |
| tree | ce73485cdc210515b928f60baa63f9029fc54a26 /libavcodec/bmp_parser.c | |
| parent | 28875c418886e1576b657882ee2b969de85041a0 (diff) | |
| parent | 20c38c9c18b75e62f6c489d9b95bea88efdf3915 (diff) | |
| download | ffmpeg-57570052e244d12900caf6f65bb3dcca12817245.tar.gz | |
Merge commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915'
* commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915':
swscale: fix some undefined signed left shifts
Conflicts:
libswscale/swscale_unscaled.c
See: 7a32ab5ed0b0523d1868da8232ff15831712a18f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmp_parser.c')
0 files changed, 0 insertions, 0 deletions