]> git.sesse.net Git - ffmpeg/commit
Merge commit 'c65d67ef50241886b9749e88fd333c52090f70c7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 14:20:30 +0000 (15:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 14:20:30 +0000 (15:20 +0100)
commit28207bfafb905ce02fcc549a27921ac085714623
tree787e75d1ee4f7e6338326f46846a1c95aac6dd81
parent19fc3c0122ebbffd5d8678cc70750503545fa7f8
parentc65d67ef50241886b9749e88fd333c52090f70c7
Merge commit 'c65d67ef50241886b9749e88fd333c52090f70c7'

* commit 'c65d67ef50241886b9749e88fd333c52090f70c7':
  aarch64: hpeldsp NEON optimizations

Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aarch64/h264qpel_init_aarch64.c
libavcodec/aarch64/hpeldsp_init_aarch64.c
libavcodec/aarch64/hpeldsp_neon.S
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h