Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 07:04:22 +0000 (09:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 07:04:22 +0000 (09:04 +0200)
commit7824b5f6f5b6200f362017960de413748d917a06
treeb425bb95791b010567bf537bb7ab71b936a3ceae
parent65c2fe7159f7521bf694b3990a148c71166e38ac
parenta66aa0daf290ef157cb3322b034b43d6201c43e9
Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'

* commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9':
  vmnc: K&R formatting cosmetics

Conflicts:
libavcodec/vmnc.c

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