-
Michael Niedermayer authored
* commit '53c20f17': 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>
ae3313e1
* commit '53c20f17': 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>