Merge commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 21:52:14 +0000 (22:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 22:19:30 +0000 (23:19 +0100)
commit9889762a9bdbb80efb79053ffb6f8fb9ecb4a5f8
tree074dbb42fca55ff1ad982ad34a4efb396d05cd31
parent1b47760bbeb6dbe17b9377bd50426df2436d35b6
parentae5e1f3d663a8c9a532d89e588cbc61f171c9186
Merge commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186'

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

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