[FFmpeg-cvslog] Merge commit 'eb9041403d820634c45ed4ee98570246a252507a' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 13:26:36 2015 +0100| [17b2ad6f43aca8519399c25eafae0728a3a95107] | committer: Michael Niedermayer

Merge commit 'eb9041403d820634c45ed4ee98570246a252507a' into release/2.2

* commit 'eb9041403d820634c45ed4ee98570246a252507a':
  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=17b2ad6f43aca8519399c25eafae0728a3a95107
---