Merge commit 'ff4d1aa8'
* commit 'ff4d1aa8': flv: K&R formatting cosmetics Conflicts: libavcodec/flv.h libavcodec/flvdec.c libavcodec/flvenc.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please register or sign in to comment