Michael Niedermayer c8be5258de 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>

2014-09-02 22:07:06 +02:00

1.2 KiB

Raw Blame History

View Raw