Merge commit '62b0462e5fa78901380ca229ddb6a7625efd61a2' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 13:13:30 +0000 (14:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 13:13:35 +0000 (14:13 +0100)
commitd7a8d07fd81cc0a6e1ecc9e5fee4ebcd93d975bc
tree4cdac266858beab5ada86ae53f1cbe5d13e9e5e8
parenta2dc8dcb66ea87b049f1b7bdb1959d609680e286
parent62b0462e5fa78901380ca229ddb6a7625efd61a2
Merge commit '62b0462e5fa78901380ca229ddb6a7625efd61a2' into release/1.1

* commit '62b0462e5fa78901380ca229ddb6a7625efd61a2':
  tiff: Check that there is no aliasing in pixel format selection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/tiff.c