Michael Niedermayer 68939f7682 Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'
* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
  Go2Meeting decoder

Conflicts:
	Changelog
	libavcodec/g2meet.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:18:30 +02:00
..
2014-07-20 02:01:50 +02:00
2015-06-10 13:08:48 -08:00
2015-04-23 23:56:21 -07:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2012-12-21 00:18:34 +01:00
2013-02-14 23:45:48 +01:00
2015-02-02 05:04:14 +01:00
2015-04-11 01:00:07 +02:00