Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 01:54:11 +0000 (03:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 01:54:11 +0000 (03:54 +0200)
commita64d6d5152189fce84bded8c73af5b49d6657cce
tree1bce125c970a611818911b5760403e6652b930e4
parentb9b2f9d218bad3001edc64704865987fd7cf7dca
parent345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe
Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'

* commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe':
  tiffdec: remove an unneeded variable

Conflicts:
libavcodec/tiff.c

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