Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:18:30 +0000 (03:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:18:30 +0000 (03:18 +0200)
commit68939f7682de3e87251c6e08470d5779804ddd6d
tree6eba76563947a5802befcf9effc39ee7638343ba
parent3974889614e04f700637b564df737c180d8583ea
parent08c2d8f0aa679c2f060721d1d0d4f33d2ae32368
Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'

* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
  Go2Meeting decoder

Conflicts:
Changelog
libavcodec/g2meet.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/elsdec.c
libavcodec/elsdec.h
libavcodec/g2meet.c
libavcodec/version.h