* commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5': vp8: K&R formatting cosmetics Conflicts: libavcodec/vp8.c libavcodec/vp8.h libavcodec/vp8data.h libavcodec/vp8dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
1.3 KiB
1.3 KiB