aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/arm/timer.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-22 23:26:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-22 23:26:23 +0100
commit9d6a27d5336550c131d2a45fc4b0e90c93e46aca (patch)
tree07fe3d8437eda2db2343a9d7d0932870e8018e8e /libavutil/arm/timer.h
parent74fed968d1b6f0aec9c08b9ac4fcad4314e0460a (diff)
parent57f09608e1600d1cf1679885a46f5004d522d68f (diff)
downloadffmpeg-9d6a27d5336550c131d2a45fc4b0e90c93e46aca.tar.gz
Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
* commit '57f09608e1600d1cf1679885a46f5004d522d68f': dsputil: Move thirdpel-related bits into their own context Conflicts: libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/timer.h')
0 files changed, 0 insertions, 0 deletions