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)
* commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911':
  indeo: Cosmetic formatting

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

Simple merge