[FFmpeg-cvslog] Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:00:54 2015 +0100| [49f477071dcda8bc956b30020808d05c005577e0] | committer: Michael Niedermayer

Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4

* commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb':
  tiffenc: initialize return value

Conflicts:
	libavcodec/tiffenc.c

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

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