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)
commit6205143bb3feb132b40743d819865a083855213b
tree19c9df467b27da50b3843da1937d726cd79064f5
parent92c858ae667a68cfbc79e5e38a027054ddf69c1b
parent9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a
Merge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a'

* commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a':
  g2meet: use av_ceil_log2 instead of a custom function

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