[FFmpeg-cvslog] Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 12:42:31 2013 +0200| [e5cdf9c03b1ef0913dad117b0e5d343a525f6d10] | committer: Michael Niedermayer

Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'

* 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 at gmx.at>

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