Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 10:42:31 +0000 (12:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 10:47:26 +0000 (12:47 +0200)
commite5cdf9c03b1ef0913dad117b0e5d343a525f6d10
tree82a2beb4104fa6f9c5d8d6a862b4165be227072c
parent5c43f3ddea40fc76264d647750f6986a9247aead
parent2d66a58ccde05e764594bd7e5f0f9244634d0b2c
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@gmx.at>
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/g2meet.c
libavcodec/utils.c
libavcodec/version.h
libavformat/riff.c