Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 02:13:37 +0000 (04:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 02:13:37 +0000 (04:13 +0200)
commitfeac9cbed0602503e9100dd2257ddc0d46e1929d
tree44eff3a2070ec8642c071e7a5d34472466b46a64
parent5b58d79a99658200ee5562999b16b5a8fa729b22
parenteda7571ea1a41c835e3a02fa9517e5bc67d7adce
Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'

* commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce':
  wmv2: K&R formatting cosmetics

Conflicts:
libavcodec/wmv2.c
libavcodec/wmv2dec.c
libavcodec/wmv2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wmv2.c
libavcodec/wmv2.h
libavcodec/wmv2dec.c
libavcodec/wmv2enc.c