Changeset a3f30f2e in ffmpeg

Timestamp:

Nov 26, 2012, 3:11:02 PM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

386fc67c

Parents:

59b68ee8 (diff), 5ae72f54 (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> (11/26/12 15:09:46)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/26/12 15:11:02)

Message:

Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b'

• commit '5ae72f54532960cb9eae82a1c9e8d505106c022b': flashsv: check for keyframe before using differential coding h264: enable low delay only if no delayed frames were seen x86: fix build without inline asm

Conflicts:

libavcodec/h264.c

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

(No files)