Changeset 7e5496fc in ffmpeg

Timestamp:

Oct 3, 2012, 11:35:02 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1e2e2c80

Parents:

695f0869 (diff), 51a15ed7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (10/03/12 11:34:57)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/03/12 11:35:02)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: ARM: use numeric ID for Tag_ABI_align_preserved segment: Pass the interrupt callback on to the chained AVFormatContext, too ARM: bswap: drop armcc version of av_bswap16() ARM: set Tag_ABI_align_preserved in all asm files

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)