Merge commit '08c2d8f0'
* commit '08c2d8f0': Go2Meeting decoder Conflicts: Changelog libavcodec/g2meet.c libavcodec/version.h Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
libavcodec/elsdec.c
0 → 100644
This diff is collapsed.
libavcodec/elsdec.h
0 → 100644
This diff is collapsed.
Please register or sign in to comment