aboutsummaryrefslogtreecommitdiffstats
path: root/compat/avisynth
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-04 10:44:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-04 10:44:34 +0100
commit4eea41cba1e1142060e53da2b2367a351d78c766 (patch)
tree7a09b24e99c866d63fbd057fb8a7d7be93e5e437 /compat/avisynth
parent3d4dc43259e2f58e7f55f2152094a1ee4333bfd2 (diff)
parentcc14ee03a7b91c69343f8d60c9e089a1950eeadb (diff)
downloadffmpeg-4eea41cba1e1142060e53da2b2367a351d78c766.tar.gz
Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'
* commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb': lavc: split slice and frame threading functions into separate files Conflicts: libavcodec/Makefile libavcodec/pthread.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/avisynth')
0 files changed, 0 insertions, 0 deletions