diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 05:29:23 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 05:30:02 +0400 |
| commit | 75b4e4013796b26c8cc22fd9f9bec0cc8672c767 (patch) | |
| tree | f907c6f0814a502e3c1d62611585fa8f0e0d4621 /libavcodec/tiffenc.c | |
| parent | 94cf83ff91b2380e487211a0444bcd4ac9b58b75 (diff) | |
| parent | fdbe18b7b0545f9b5923d25a5433e4f735719ecc (diff) | |
Merge commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc'
* commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc':
tiffdec: use a single strip if RowsPerStrip is 0
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiffenc.c')
0 files changed, 0 insertions, 0 deletions