Merge commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 10:07:58 +0000 (12:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 10:08:22 +0000 (12:08 +0200)
commit7d3b55c6a427a33f44e3d512c5866eebe5df7915
tree346863d015bfe80c84d9f0328003f65c30b76dec
parent9b10440dcd1a250c0c00cfcd83ae62a4ae6d2544
parent6dfacd7ab126aea1392949d1aa10fdc3d3eeb911
Merge commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911'

* commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911':
  indeo: Cosmetic formatting

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