Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 09:05:02 +0000 (11:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 09:12:23 +0000 (11:12 +0200)
commit3a8b52c0113be1b0e74246adca71834f1d0734b2
treef39ec0546c2a7ca599f6dbe6449ccf31f43dd591
parent12e9821042b77e2f631d944365c0a09111fd41d1
parent3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8
Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'

* commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8':
  cavs: more K&R formatting cosmetics

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