[FFmpeg-cvslog] Merge commit '103937681d7e6afd3e8caf8937272575e450fb55'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  8 11:18:37 2013 +0200| [a804632b155d7e4841ee568cadb05d4f7e5d4af9] | committer: Michael Niedermayer

Merge commit '103937681d7e6afd3e8caf8937272575e450fb55'

* commit '103937681d7e6afd3e8caf8937272575e450fb55':
  tiff: refactor deflate support in a separate function

Conflicts:
	libavcodec/tiff.c

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

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