aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/cpu.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-21 21:30:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-21 21:30:31 +0200
commitf6ff1cb1bae5d457dccc9540288b90d44e824ee1 (patch)
tree087d3f24d4603982f1fc13c67162a89db1ebdc45 /libavutil/cpu.h
parent24e81a0a8d86e764dfb89cb21e9caa4aff073e1c (diff)
parent7cb66ebc0be48489785f7166c9d15eac594b0763 (diff)
downloadffmpeg-f6ff1cb1bae5d457dccc9540288b90d44e824ee1.tar.gz
Merge commit '7cb66ebc0be48489785f7166c9d15eac594b0763'
* commit '7cb66ebc0be48489785f7166c9d15eac594b0763': error_resilience: Drop asserts from guess_mv() Conflicts: libavcodec/error_resilience.c Not merged, the asserts in FFmpeg build and work fine Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.h')
0 files changed, 0 insertions, 0 deletions