Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 20:32:40 +0000 (22:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 20:32:40 +0000 (22:32 +0200)
commit1df2f7b6a88ed871231a3a78319e997523d837a5
tree9245df75e4e9b9954c08bc26965691b21e00fabb
parent013172ae9f1ab35b70732dcab6385743c5fed876
parenteba2233b58c2c4b468c58287d6537b2f1188a8cd
Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'

* commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd':
  build: Add define for SIMD extensions requiring 16-byte aligned buffers

Conflicts:
configure
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/internal.h