aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/ppc/timer.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-25 14:14:21 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-25 14:14:21 +0100
commite9125dd5563484a067ef75b6fce4fbef235c5c6e (patch)
tree76003b3c06225cca688438f1aedc7d2a539174c8 /libavutil/ppc/timer.h
parentd07b0d992736e01006caa64b87d996f902d357db (diff)
parent2c10e2a2f62477efaef5b641974594f7df4ca339 (diff)
downloadffmpeg-e9125dd5563484a067ef75b6fce4fbef235c5c6e.tar.gz
Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'
* commit '2c10e2a2f62477efaef5b641974594f7df4ca339': build: Make the H.264 parser select h264qpel x86: h264qpel: add cpu flag checks for init function Conflicts: libavcodec/x86/h264_qpel.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/ppc/timer.h')
0 files changed, 0 insertions, 0 deletions