Merge commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Apr 2015 18:48:29 +0000 (20:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Apr 2015 18:48:44 +0000 (20:48 +0200)
commitedaca0812a05523b82039d5be6b1aa069b68b9c6
tree757cefd3ebea24e8823aedaef832c8d25bf1d1a8
parent8e1717cf12f88823b851cca706a2e5ab7aa1c7c4
parentbb815dfc38b8ef7a89d6b9684ce0cdc296385d6d
Merge commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d'

* commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d':
  g2meet: K&R formatting cosmetics

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