[FFmpeg-cvslog] Merge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  8 11:31:31 2013 +0200| [1fec361f353cf140a67b28c2d73c3822a89a76d6] | committer: Michael Niedermayer

Merge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde'

* commit '016c5b066de08a93a5f6b5beb0ef377356b35cde':
  tiff: refactor fax 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=1fec361f353cf140a67b28c2d73c3822a89a76d6
---