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: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment