Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 10:00:22 +0000 (11:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 10:00:22 +0000 (11:00 +0100)
commit8bbb487e443a7979f223759a5d6c2d7662a5948d
treedfcc859ca0fb087b36c4f7961f6e9e252fea7fdd
parent9f16cb9e50a5a196af9244dc7d33ed193227528a
parent130cefc9dcedea5babc349251fbeec6f037144ac
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/platform: Fix 10l typo
  dsputil: Move STRIDE_ALIGN macro to the only place it is used

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.h
libavcodec/rectangle.h
libavcodec/utils.c