diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-29 01:08:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-29 01:08:57 +0200 |
| commit | 7771daaea7d524e97fe37ad604b67ba859635791 (patch) | |
| tree | 44f910fc2c4d10a67283e2ca8055001f6478b8e8 /libavformat/matroska.h | |
| parent | 39cd9fdbf80292b3cf0aab20cacfdb18e85bb2b9 (diff) | |
| parent | 9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5 (diff) | |
| download | ffmpeg-7771daaea7d524e97fe37ad604b67ba859635791.tar.gz | |
Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'
* commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5':
license: Mention that vf_interlace is GPL, not LGPL
Conflicts:
LICENSE.md
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
0 files changed, 0 insertions, 0 deletions