[FFmpeg-cvslog] Merge commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct 10 09:13:32 2015 +0200| [d3952510d21a4b337e7483b38c2630656500b300] | committer: Hendrik Leppkes

Merge commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3952510d21a4b337e7483b38c2630656500b300
---