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)
* commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344':
  g2m: Relax resolution change constraints

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

Simple merge