Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Mar 2014 00:39:46 +0000 (01:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Mar 2014 00:55:31 +0000 (01:55 +0100)
commitae3313e1548641e3b4a61520e119729a8b61e061
treec02a97bdede1293f5b180ebfa1ac089cdf8ab8fb
parentaf3b6aed0da5e292897b3be099c3cc7a3a44e2c4
parent53c20f17c78d1d8a0fc2505868f201e69ff59cc5
Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'

* 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>
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8_parser.c
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h