* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c': Go2Webinar decoder Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>