aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/pcm.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-14 14:53:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-14 14:59:01 +0100
commit12bc33d7cd04d863466d4a2d18a7fbcb59372429 (patch)
treeecaa990ffd7039f9ece6f9633fe19766a8f5f942 /tests/fate/pcm.mak
parentb148a39d55ee90255dad0e58d1c11181343ea30e (diff)
parentd8e763fda77242a77732b6e537facb1de9029c05 (diff)
downloadffmpeg-12bc33d7cd04d863466d4a2d18a7fbcb59372429.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: vf_yadif: Relicense from GPL to LGPL Conflicts: LICENSE configure libavfilter/vf_yadif.c libavfilter/x86/vf_yadif.asm libavfilter/x86/vf_yadif_init.c libavfilter/yadif.h See: 194ef56ba7e659196fe554782d797b1b45c3915f Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/pcm.mak')
0 files changed, 0 insertions, 0 deletions