Merge commit '2613de88051818abafccb98646394341887acb3a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 09:42:34 +0000 (10:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 09:56:30 +0000 (10:56 +0100)
We dont use au_read_packet() anymore and block_align is already set.
Thus nothing had to be merged from these.

* commit '2613de88051818abafccb98646394341887acb3a':
  au: do not set pkt->size directly
  au: set block_align and use it in au_read_packet()

Conflicts:
libavformat/au.c

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

Trivial merge