Merge commit '68fd80ee1ca22c39b6ef4e6641b5b2e0d4d89a14' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 08:42:11 +0000 (10:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 08:42:11 +0000 (10:42 +0200)
commit3e78f8689167d6edcf15afb2836ede9505bca1a2
treefd603ef19cd1bfaff0a5ffb672597501ee3d7c14
parent0edc79962641dd853cda187ee13b617701346061
parent68fd80ee1ca22c39b6ef4e6641b5b2e0d4d89a14
Merge commit '68fd80ee1ca22c39b6ef4e6641b5b2e0d4d89a14' into release/2.2

* commit '68fd80ee1ca22c39b6ef4e6641b5b2e0d4d89a14':
  g2meet: allow size changes within original sizes

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