diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 12:51:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 12:51:00 +0100 |
| commit | 8617be28d074c4708d2c948cbc311737cf2fbf39 (patch) | |
| tree | 9698a0a7aed4197de54fefad52ea9529b78d593f /libavcodec | |
| parent | bdf831859f0df264de4a23d3ed80684b6b1324b1 (diff) | |
| parent | 430d12196432ded13f011a3bf7690f03c9b2e5d6 (diff) | |
Merge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'
* commit '430d12196432ded13f011a3bf7690f03c9b2e5d6':
pcx: round up in bits->bytes conversion in a buffer size check
Conflicts:
libavcodec/pcx.c
See: 6462268e74fa2c935c2936904cc1da9f499c04f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions