Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 09:06:27 +0000 (11:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 09:06:27 +0000 (11:06 +0200)
commit482c1ac849faa783a1694222837c9c9cb619237f
tree9a494c43d8a54a20b134d9007d694b4a40b6d6ad
parent1ba4cbf734b343f82e0ae4ab6be3756249771afa
parent13f57a4d881ec669b87bf82f424bfff502433060
Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'

* commit '13f57a4d881ec669b87bf82f424bfff502433060':
  wav: K&R formatting cosmetics

Conflicts:
libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/w64.c
libavformat/wavdec.c