Merge commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 10 Oct 2015 07:13:32 +0000 (09:13 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 10 Oct 2015 07:13:32 +0000 (09:13 +0200)
commitd3952510d21a4b337e7483b38c2630656500b300
tree3cf80916e20063c1f788897557482c8c5fc1bacf
parentdab5f65b25f1c9c3de4d1f42c135768b72f45351
parent3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344
Merge commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344'

* commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344':
  g2m: Relax resolution change constraints

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/g2meet.c