[FFmpeg-cvslog] Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 24 13:28:57 2014 +0100| [d2e0543766e0c8c077ab51495991f47066d9e768] | committer: Michael Niedermayer

Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'

* commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1':
  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=d2e0543766e0c8c077ab51495991f47066d9e768
---