Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 23:48:43 +0000 (01:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 23:49:19 +0000 (01:49 +0200)
commit6145b1d9c11bb5261e4b5137ef31defacad56eb5
tree786abad09307ca729be4a42e693abaaa2f47e6bc
parent69505a89f1edcda4191d62149d801da6f48a6c27
parentbf2064f046af64c59a416c814474a39b0a457569
Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'

* commit 'bf2064f046af64c59a416c814474a39b0a457569':
  tiffdec: rename variables for consistency and fix variable shadowing

Conflicts:
libavcodec/tiff.c

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