Changeset bce42e95 in ffmpeg

Timestamp:

May 4, 2012, 10:54:28 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

441dce21

Parents:

b18c9f1e (diff), 313f9fbf (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> (05/04/12 22:44:48)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/04/12 22:54:28)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: configure: add POWER[5-7] support arm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6 vqavideo: return error if image size is not a multiple of block size cosmetics: indentation avformat: only fill-in interpolated timestamps if duration is non-zero avformat: remove a workaround for broken timestamps

Conflicts:

libavformat/utils.c

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

(No files)