-
Michael Niedermayer authored
* commit 'ff4d1aa8': flv: K&R formatting cosmetics Conflicts: libavcodec/flv.h libavcodec/flvdec.c libavcodec/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
c8be5258
* commit 'ff4d1aa8': flv: K&R formatting cosmetics Conflicts: libavcodec/flv.h libavcodec/flvdec.c libavcodec/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>