Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 08:50:05 +0000 (10:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 08:50:05 +0000 (10:50 +0200)
commite381cc3e4ea61b5d42b45162ef6969a90a0507c9
treedb9e457d9aa2eb4129d0a189d1890338d91a1fc1
parentde9fbf3dc41abb8eb7a70b8a6bbfce64cee21bc5
parent1c88617b9421c9af8ae961c05d2381b19c585026
Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'

* commit '1c88617b9421c9af8ae961c05d2381b19c585026':
  riff: K&R formatting cosmetics

Conflicts:
libavformat/riff.c

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