Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:48:23 +0000 (04:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:49:54 +0000 (04:49 +0100)
* qatar/master:
  go2meeting: disallow tile dimensions that are not multiple of 16

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

Simple merge