Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 19:57:46 +0000 (21:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 19:57:46 +0000 (21:57 +0200)
commit4c731233338d2bc6d9646808b7599224450932c6
tree7c8ba788012e320ba274db88e8fa4b099d7ccdb3
parent50c6bffb67d140bcf4b28d0b4495648b9f6b07f9
parentf61e47dd68582529bcf6d42d861c70a320cd1b67
Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'

* commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67':
  asv: K&R formatting cosmetics

Conflicts:
libavcodec/asvdec.c
libavcodec/asvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/asv.c
libavcodec/asv.h
libavcodec/asvdec.c
libavcodec/asvenc.c