Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 20:07:06 +0000 (22:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 20:07:06 +0000 (22:07 +0200)
commitc8be5258dec928119fab414341b13c0cf5405294
tree01c101275f27b02abbda414b4b8d5b0b3dca72bd
parent4c731233338d2bc6d9646808b7599224450932c6
parentff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef
Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'

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

Conflicts:
libavcodec/flv.h
libavcodec/flvdec.c
libavcodec/flvenc.c

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