Merge commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 01:29:23 +0000 (03:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 01:30:02 +0000 (03:30 +0200)
commit75b4e4013796b26c8cc22fd9f9bec0cc8672c767
treef907c6f0814a502e3c1d62611585fa8f0e0d4621
parent94cf83ff91b2380e487211a0444bcd4ac9b58b75
parentfdbe18b7b0545f9b5923d25a5433e4f735719ecc
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>
libavcodec/tiff.c