aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING.GPLv2
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-02 21:00:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-02 21:01:10 +0200
commit50b0edea9f48c831909313c15b0677957789ff53 (patch)
tree9c1dbf2e74e027022cefbba74543b747d8884485 /COPYING.GPLv2
parent083e65cfd22e44719eedfad4c2d3ed290688661d (diff)
parent15616eb04206b64bcf08ad351f4c754e69e00666 (diff)
downloadffmpeg-50b0edea9f48c831909313c15b0677957789ff53.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: intrax8: move functions from dsputil to own context Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions