-
Michael Niedermayer authored
* commit 'a8014534': g2meet: K&R formatting cosmetics Conflicts: libavcodec/g2meet.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
17a5dbac
* commit 'a8014534': g2meet: K&R formatting cosmetics Conflicts: libavcodec/g2meet.c Merged-by: Michael Niedermayer <michaelni@gmx.at>