[FFmpeg-cvslog] Merge commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 03:29:23 2014 +0200| [75b4e4013796b26c8cc22fd9f9bec0cc8672c767] | committer: Michael Niedermayer

Merge commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc'

* commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc':
  tiffdec: use a single strip if RowsPerStrip is 0

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75b4e4013796b26c8cc22fd9f9bec0cc8672c767
---