diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 11:51:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 11:52:19 +0200 |
| commit | 0796a2ab4ff58d454006403395a4be91c403f161 (patch) | |
| tree | 80bf5e2d51f28dc37d6e5ad13289fa484bf5b794 /ffplay.c | |
| parent | 57f49fa0edafd82315aa3a409ce1051f7dea6981 (diff) | |
| parent | eb31256f12bf0c85aded1612551ce9230356879e (diff) | |
Merge commit 'eb31256f12bf0c85aded1612551ce9230356879e'
* commit 'eb31256f12bf0c85aded1612551ce9230356879e':
g2meet: Support G2M5 codec variant
Conflicts:
libavcodec/version.h
See: 4ba5420e4d3699b89c9f7f15928cd486f88e9562
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions