Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 09:44:11 +0000 (11:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 09:44:11 +0000 (11:44 +0200)
commit7cb5467a52011d194289035b51e27c4df80bf2a2
tree09df9a077d623d2926411acc3697d1e377ce90c1
parent2976e2a102cd8202e0f7b9e601d62354b7ad1c72
parent46ce9ded96ffcb798b03da894cdb5fdac376a6ee
Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'

* commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee':
  tiff: K&R formatting cosmetics

Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c

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