Merge commit '9103185bd116930f90b847090e66a64fa9971ce2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 22:07:17 +0000 (23:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 22:24:50 +0000 (23:24 +0100)
commitf5e6b49cd23b3437681220d40caaf103cb675407
treeaa7e31c10fa35d1ee1646599d501f8a59c3f17b1
parent1306359ea9cdf281d3720f43e9e6113f17add143
parent9103185bd116930f90b847090e66a64fa9971ce2
Merge commit '9103185bd116930f90b847090e66a64fa9971ce2'

* commit '9103185bd116930f90b847090e66a64fa9971ce2':
  dsputil: Drop ff_check_alignment() function

Conflicts:
libavcodec/dsputil.c

Not merged, as this check can safe the user and us some time
debuging misalignment issues.

Merged-by: Michael Niedermayer <michaelni@gmx.at>