Merge commit '14ddbb477faef359983151b763fd8b20e578651b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 00:04:38 +0000 (02:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 00:04:38 +0000 (02:04 +0200)
commitfb8a10db5d77424774493376b5d0412808bb0491
treea89ad729bc5e983a4393d9a5977da684994519fc
parent5970f4bb027c4eb8aca3cdca677fcca03aef1e82
parent14ddbb477faef359983151b763fd8b20e578651b
Merge commit '14ddbb477faef359983151b763fd8b20e578651b'

* commit '14ddbb477faef359983151b763fd8b20e578651b':
  cavs: K&R formatting cosmetics

Conflicts:
libavcodec/cavs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cavs.c