Merge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 17:09:49 +0000 (19:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 17:09:55 +0000 (19:09 +0200)
* commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a':
  g2meet: use av_ceil_log2 instead of a custom function

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

Simple merge