aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-15 15:20:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-15 15:20:30 +0100
commit28207bfafb905ce02fcc549a27921ac085714623 (patch)
tree787e75d1ee4f7e6338326f46846a1c95aac6dd81 /libavformat
parent19fc3c0122ebbffd5d8678cc70750503545fa7f8 (diff)
parentc65d67ef50241886b9749e88fd333c52090f70c7 (diff)
downloadffmpeg-28207bfafb905ce02fcc549a27921ac085714623.tar.gz
Merge commit 'c65d67ef50241886b9749e88fd333c52090f70c7'
* commit 'c65d67ef50241886b9749e88fd333c52090f70c7': aarch64: hpeldsp NEON optimizations Conflicts: libavcodec/hpeldsp.c libavcodec/hpeldsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions