aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-29 01:08:57 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-29 01:08:57 +0200
commit7771daaea7d524e97fe37ad604b67ba859635791 (patch)
tree44f910fc2c4d10a67283e2ca8055001f6478b8e8 /configure
parent39cd9fdbf80292b3cf0aab20cacfdb18e85bb2b9 (diff)
parent9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5 (diff)
downloadffmpeg-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 'configure')
0 files changed, 0 insertions, 0 deletions