[FFmpeg-cvslog] Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 19:18:04 2015 +0200| [5142963b7d93fd96f0e5b10a7cf2312825af87dc] | committer: Michael Niedermayer

Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'

* commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721':
  g2meet: force simple idct for identical results over all fate configs

Conflicts:
	tests/ref/fate/g2m3
	tests/ref/fate/g2m4

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

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