Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:39:42 +0000 (14:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:48:55 +0000 (14:48 +0200)
* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
  g2meet: Allocate cursor buffers large enough to fit the aligned width

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

Simple merge