Merge commit '77eb3d9a60a9c2bb6d87c960ac186af242bbcc9e' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:43:06 +0000 (00:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:43:26 +0000 (00:43 +0100)
commit16c838b69a4e359705cfd3f1b4c6e2113c934c85
tree85793619ae7a3f77fedeb60d37a74bb5ded835fc
parente2c82f7d9362192671bff9959303892107c5d114
parent77eb3d9a60a9c2bb6d87c960ac186af242bbcc9e
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@gmx.at>
libavcodec/tiff.c