Merge commit '2613de88051818abafccb98646394341887acb3a'

Browse Source

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>

...

This commit is contained in:

Michael Niedermayer

2013-01-10 10:42:34 +01:00

parent 70a65ecabf 2613de8805

commit 4cd89022e7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available