[FFmpeg-cvslog] Merge commit 'e4529df944616917ae8462f5102253ff7f983093'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  2 12:07:20 2013 +0200| [ae48547a5296f7aa5518d934325aeaddbdad2cd5] | committer: Michael Niedermayer

Merge commit 'e4529df944616917ae8462f5102253ff7f983093'

* commit 'e4529df944616917ae8462f5102253ff7f983093':
  flvdec: K&R formatting cosmetics

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae48547a5296f7aa5518d934325aeaddbdad2cd5
---