Commit 4cd89022 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '2613de88'

We dont use au_read_packet() anymore and block_align is already set.
Thus nothing had to be merged from these.

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

Conflicts:
	libavformat/au.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 70a65eca 2613de88
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment