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)
* commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc':
  tiffdec: use a single strip if RowsPerStrip is 0

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/tiff.c

Simple merge