diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 10:42:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 10:56:30 +0100 |
| commit | 4cd89022e7ab3992c32a55ffa818626345d923f4 (patch) | |
| tree | 5d50bdef5dee2f182203f0b4d05e5dad013d37a1 /libavformat/bmv.c | |
| parent | 70a65ecabff00a8330a56ceb51b15d10cb5b5389 (diff) | |
| parent | 2613de88051818abafccb98646394341887acb3a (diff) | |
| download | ffmpeg-4cd89022e7ab3992c32a55ffa818626345d923f4.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavformat/bmv.c')
0 files changed, 0 insertions, 0 deletions