summaryrefslogtreecommitdiff
path: root/libavcodec/elsdec.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'Michael Niedermayer2015-07-011-4/+4
| | | | | | | | | | | | * commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368': Go2Meeting decoder Conflicts: Changelog libavcodec/g2meet.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Go2Meeting decoderKostya Shishkov2015-07-011-0/+60
ELS and ePIC decoder courtesy of Maxim Poliakovski, cleanup and integration by Diego Biurrun. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>