Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:12:48 +0000 (11:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:12:48 +0000 (11:12 +0200)
commit56090b5b80431bfd791dbe8cfd23c058214118da
tree01f65dd3c9dcb2369d04946f19215d7e2b8d3ead
parent15cee5e5628a80a51d1bb298c8b838ddefd75a88
parent3865ba7b21aef5d60183719e238361ec8797ab5a
Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'

* commit '3865ba7b21aef5d60183719e238361ec8797ab5a':
  iff: K&R formatting cosmetics

Conflicts:
libavcodec/iff.c

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