* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368': Go2Meeting decoder Conflicts: Changelog libavcodec/g2meet.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>