Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:15:37 +0000 (23:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:15:37 +0000 (23:15 +0200)
commit3ea5beab8f7352c94f71148ab98dd247412129a3
tree19fe460efe5b81d158d46f9c50e0feee8992f7bd
parent0a5cc20d4aace91fdc8c56149bfee1efb726da8c
parentc6b42e85493915a3c3891345f57422f9031a0b4f
Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'

* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
  flv: K&R formatting cosmetics

Conflicts:
libavcodec/flvdec.c

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