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

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 00:43:06 2015 +0100| [16c838b69a4e359705cfd3f1b4c6e2113c934c85] | committer: Michael Niedermayer

Merge commit '77eb3d9a60a9c2bb6d87c960ac186af242bbcc9e' into release/2.4

* commit '77eb3d9a60a9c2bb6d87c960ac186af242bbcc9e':
  tiff: Check that there is no aliasing in pixel format selection

Conflicts:
	libavcodec/tiff.c

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

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