[FFmpeg-cvslog] Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 03:22:33 2015 +0200| [9e93e544dc2efa76bce51e59c2435414e38b0291] | committer: Michael Niedermayer

Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'

* commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008':
  g2meet: Add FATE tests for all three G2M variants

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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