Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 06:07:58 +0000 (08:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 06:09:28 +0000 (08:09 +0200)
commit29d64b1d8ebe78bf4f57a127b954cc3f0aec8f84
tree94b7af6803bec33e8654a4bbd80a3da68871d111
parentb35ef855a4fa6d8839f42f4836813bc0050adf96
parent66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a
Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'

* commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a':
  lavc doxy: remove false statements about alignment requirements.

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