aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/pngdsp.asm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-23 11:42:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-23 11:42:16 +0100
commit96b495f443832082777d7dad7349dd6ec97b6cb9 (patch)
tree67c21ef1c8441d60dcc7054cae839b451d448a75 /libavcodec/x86/pngdsp.asm
parent0425e16d96cccf6de32231ecfc37cde72985dde5 (diff)
parente570f895cdccf2535a71fec1c607751ddb94fd5a (diff)
downloadffmpeg-96b495f443832082777d7dad7349dd6ec97b6cb9.tar.gz
Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'
* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a': libschroedinger: Check memory allocations Conflicts: libavcodec/libschroedinger.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/pngdsp.asm')
0 files changed, 0 insertions, 0 deletions