2 Commits

Author	SHA1	Message	Date
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
Kostya Shishkov	08c2d8f0aa	Go2Meeting decoder ... ELS and ePIC decoder courtesy of Maxim Poliakovski, cleanup and integration by Diego Biurrun. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2015-07-01 01:08:15 +02:00