aboutsummaryrefslogtreecommitdiffstats
path: root/tools/crypto_bench.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-26 01:39:33 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-26 01:54:55 +0100
commit965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35 (patch)
tree1c00ee6a0981502047f9c0a3e53ec79a7af900b9 /tools/crypto_bench.c
parent53167ecfdb99151c1f0d243275675a75efb881a7 (diff)
parentfb0c9d41d685abb58575c5482ca33b8cd457c5ec (diff)
downloadffmpeg-965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35.tar.gz
Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec': avutil: remove timer.h include from internal.h Conflicts: libavcodec/ffv1dec.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/crypto_bench.c')
0 files changed, 0 insertions, 0 deletions