aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-21 22:02:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-21 22:02:23 +0200
commit9a436ae30f10614e74fa4e1a561ce91cb0b2dd77 (patch)
tree7afb103030d86a2eb06baabadf86d66937c5ceb8 /libswscale
parent79df91bfc403e97e50f3ba0ed9acabeeb5590cd4 (diff)
parent16b7328058fa600d5158c84d9cc621a134eb88bc (diff)
downloadffmpeg-9a436ae30f10614e74fa4e1a561ce91cb0b2dd77.tar.gz
Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'
* commit '16b7328058fa600d5158c84d9cc621a134eb88bc': build: Conditionally build and run DCT test program Conflicts: libavcodec/Makefile libavcodec/dct-test.c tests/fate/libavcodec.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions