Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Mar 2014 23:41:47 +0000 (00:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Mar 2014 23:41:47 +0000 (00:41 +0100)
commit17a5dbacf50cafbf4034732ad09f252c076bf26c
treed5dc875bcfa1bf2c1dc8e67b8ec4fc781726bd94
parentb28c37156782e563341e1bccc1a15dfbc01a569f
parenta801453423420915425f902bf9f9cbe982a55d87
Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'

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

Conflicts:
libavcodec/g2meet.c

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