[FFmpeg-cvslog] Merge commit '2613de88051818abafccb98646394341887acb3a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 10 10:42:34 2013 +0100| [4cd89022e7ab3992c32a55ffa818626345d923f4] | committer: Michael Niedermayer

Merge commit '2613de88051818abafccb98646394341887acb3a'

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cd89022e7ab3992c32a55ffa818626345d923f4
---