Merge commit 'e4529df944616917ae8462f5102253ff7f983093'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Aug 2013 10:07:20 +0000 (12:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Aug 2013 10:08:56 +0000 (12:08 +0200)
commitae48547a5296f7aa5518d934325aeaddbdad2cd5
tree3a61180d468bb4e632f302beb47c5e95f6bafa8b
parentcb73f84087abe2d5fecaacc199246bacf2f450c8
parente4529df944616917ae8462f5102253ff7f983093
Merge commit 'e4529df944616917ae8462f5102253ff7f983093'

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

Conflicts:
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flvdec.c