diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:18:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:18:30 +0200 |
| commit | 68939f7682de3e87251c6e08470d5779804ddd6d (patch) | |
| tree | 6eba76563947a5802befcf9effc39ee7638343ba /libavdevice/opengl_enc.c | |
| parent | 3974889614e04f700637b564df737c180d8583ea (diff) | |
| parent | 08c2d8f0aa679c2f060721d1d0d4f33d2ae32368 (diff) | |
| download | ffmpeg-68939f7682de3e87251c6e08470d5779804ddd6d.tar.gz | |
Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'
* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
Go2Meeting decoder
Conflicts:
Changelog
libavcodec/g2meet.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/opengl_enc.c')
0 files changed, 0 insertions, 0 deletions