Merge commit '037fea388e0df2a22441bc1ed86794152161baf1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:19:12 +0000 (10:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:19:12 +0000 (10:19 +0100)
commit0b82fdcc469ec8f5dd4affe1fe5ae8710b373cd2
treea6ca9af5906795f8d523e8c54f45bee5823e6b3c
parent7146eacfc5f20dea719d6581d72b7532ab39688d
parent037fea388e0df2a22441bc1ed86794152161baf1
Merge commit '037fea388e0df2a22441bc1ed86794152161baf1'

* commit '037fea388e0df2a22441bc1ed86794152161baf1':
  flashsv: K&R formatting cosmetics

Conflicts:
libavcodec/flashsv.c

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